diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-11-07 17:43:41 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-11-07 17:43:41 +0000 |
| commit | b4022e8e792731f8fad28d11043bba787bd19259 (patch) | |
| tree | c1d73259d579b3ec72297450b55581fad36c5e1a | |
| parent | 32311f2f3506cfbda509b24f030ade9dcb552715 (diff) | |
| download | ATCD-b4022e8e792731f8fad28d11043bba787bd19259.tar.gz | |
merge in trunk
838 files changed, 24382 insertions, 28255 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index adfa45e30d2..3edb65ad76c 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -281,150 +281,14 @@ The following sections explain how to build ACE on: <hr align="left" width="50%"> <h2><a name="unix">Building and Installing ACE on UNIX</a></h2> -As of ACE 5.4, you can choose between two methods of building ACE on -UNIX: +As of ACE 6.1, you can building ACE on +UNIX with: <ol> - <li><a href="#unix_autoconf">GNU Autoconf</a></li> <li><a href="#unix_traditional">Traditional ACE/GNU Make Configuration</a></li> </ol> The <a href="#win32">build process for Windows</a> is different from both of the UNIX methods. -<h3><a name="unix_autoconf">Building ACE with GNU Autoconf</a></h3> -<p> -GNU Autoconf support is available in the ACE and ACE+TAO distributions -in the DOC group website. Support for Autoconf is not included in -distributions that contain CIAO. -</p> -<p> -GNU Autoconf support has been partially present in a number of ACE -versions. However, ACE 5.4 was the first version that supported it in -earnest. The range of platforms on which GNU autoconf support is regularly -tested is not as broad as for the traditional configuration method, so you -should be careful to test the resulting ACE library before using it in -your applications. You can review the -<a href="http://www.dre.vanderbilt.edu/scoreboard/" target="_blank"> -build scoreboard</a> to check the currently tested set of autoconfigured -platforms (look for autoconf in the platform name). -Any help you can lend to improve the ACE build process using GNU Autoconf -would be very much appreciated. Please send any fixes to the -<a href="mailto:ace-users@cse.wustl.edu">ACE users</a> mailing list -using the standard <a href="PROBLEM-REPORT-FORM">PROBLEM-REPORT-FORM</a>. -</p> -<p> -The kit has been bootstrapped so you do not need to install the GNU -Autotools (autoconf, automake, libtool) unless you want to participate -in <a href="#autoconf_development">testing and developing</a> this -process further or if you are working directly off of sources in the -ACE subversion repository. To simply configure and build ACE, do: -</p><ol> - <li><code>cd</code> to the top-level <code>ACE_wrappers</code> directory.</li> - <li>Create a subdirectory to hold your build's configuration and built - ACE version, and then change to the new directory: - <pre> mkdir build - cd build</pre> - Note that you do not run the <code>create_ace_build.pl</code> utility - mentioned in the <a href="#cloning">Cloning the Source Tree</a> - section. The configure script takes care of creating all files - and links that are needed.</li> - <li>Configure ACE for your platform by issuing the following command: - <pre> ../configure [options]</pre> - <code>options</code> can be a variable setting (such as setting - <code>CXX</code> to your C++ compiler command) any standard GNU - configure options, or any of the following ACE configure options - (default values are in parentheses): - <ul> - <li><code>--enable-alloca</code> (no): Enable <code>alloca()</code> - support.</li> - <li><code>--enable-debug</code> (yes): Build ACE with debugging - support.</li> - <li><code>--enable-exceptions</code> (yes): Build ACE with C++ - exception support compiled in.</li> - <li><code>--enable-fast</code> (no): Use the Sun C++ <code>-fast</code> - option to build. Only used on Solaris.</li> - <li><code>--enable-ipv4-ipv6</code> (no): Enable IPv4/IPv6 migration support.</li> - <li><code>--enable-ipv6</code> (no): Enable IPv6 support.</li> - <li><code>--enable-inline</code> (yes): Enable inline functions.</li> - <li><code>--enable-optimize</code> (yes): Enable building optimized.</li> - <li><code>--enable-prof</code> (no): Enable profiling support.</li> - <li><code>--enable-purify</code> (no): Build with support for - IBM Rational Purify.</li> - <li><code>--enable-quantify</code> (no): Build with support for - IBM Rational Quantify.</li> - <li><code>--enable-repo</code> (no): Enable the GNU g++ - <code>-frepo</code> option. Only useful for pre-3.0 g++.</li> - <li><code>--enable-stdcpplib</code> (yes): Build with support for the - standard C++ library, as opposed to the older iostreams library.</li> - <li><code>--enable-log-msg-prop</code> (yes): Enable - <code>ACE_Log_Msg</code> property propagation to ACE-created - threads.</li> - <li><code>--enable-logging</code> (yes): Enable the ACE logging - macros.</li> - <li><code>--enable-malloc-stats</code> (no): Compile in additional code - for collecting memory allocation statistics.</li> - <li><code>--enable-pi-pointers</code> (yes): Enable - position-independent pointers for shared memory classes.</li> - <li><code>--enable-probe</code> (no): Enable the - <code>ACE_Timeprobe</code> class.</li> - <li><code>--enable-reentrant</code> (yes): Enable use of platform's - reentrant functions.</li> - <li><code>--enable-static-obj-mgr</code> (yes): Enable use of a - static <code>ACE_Object_Manager</code>.</li> - <li><code>--enable-threads</code> (yes): Enable threading support.</li> - <li><code>--enable-verb-not-sup</code> (no): Enable verbose ENOTSUP - reports at run time.</li> - <li><code>--enable-trace</code> (no): Enable ACE execution tracing - support.</li> - <li><code>--enable-fl-reactor</code> (no): Enable support for the - <code>ACE_FlReactor</code> class.</li> - <li><code>--enable-qt-reactor</code> (no): Enable support for the - <code>ACE_QtReactor</code> class.</li> - <li><code>--enable-tk-reactor</code> (no): Enable support for the - <code>ACE_TkReactor</code> class.</li> - <li><code>--enable-xt-reactor</code> (no): Enable support for the - <code>ACE_XtReactor</code> class.</li> - <li><code>--enable-gperf</code> (yes): Build the implementation of - gperf that comes with ACE.</li> - <li><code>--enable-qos</code> (no): Include the ACE_QoS library when - building ACE.</li> - <li><code>--enable-ssl</code> (yes): Include the ACE_SSL library when - building ACE. Requires the SSL components to be available using the - compiler's and linker's default search directories.</li> - <li><code>--with-openssl</code>: Specifies the root directory of the - OpenSSL installation; expects the specified directory to have - <code>include</code> and <code>lib</code> subdirectories. To - specify other locations for the header and libraries, use one or - both of the following.</li> - <li><code>--with-openssl-include</code>: Specify the directory - containing the OpenSSL header files.</li> - <li><code>--with-openssl-libdir</code>: Specify the directory - containing the OpenSSL libraries.</li> - <li><code>--with-tli-device</code> (/dev/tcp): Specifies the device - name for opening a TLI device at run time.</li> - </ul> - </li> - <li>Build ACE by typing <code>make</code>. - </li><li>(Optional) Install ACE by typing <code>make install</code>. -</li></ol> - -<h4><a name="autoconf_development">Testing and Developing GNU Autotool -Support in ACE</a></h4> -<p> -In order to test and develop the GNU Autotool support in ACE or -bootstrap autotool support into ACE when working directly off of ACE -sources in the subversion repository, you must have recent versions of GNU -Autoconf, Automake and Libtool installed on your host. Once -installed, autotool support may be bootstrapped into your workspace by -doing the following: - <blockquote> - <code> - cd ACE_wrappers<br> - ./bin/bootstrap<br> - </code> - </blockquote> -After doing so, you will be able to run the <code>configure</code> -script. - <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></h3> <p> Here's what you need to do to build ACE using GNU Make and ACE's traditional diff --git a/ACE/ACEXML/ChangeLog b/ACE/ACEXML/ChangeLog index cf9591f72b8..28bf8bed510 100644 --- a/ACE/ACEXML/ChangeLog +++ b/ACE/ACEXML/ChangeLog @@ -1,3 +1,39 @@ +Fri Oct 21 09:50:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * parser/parser/Parser.cpp: + Initialise variable with 0 + +Fri Oct 21 09:48:21 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * common/Attributes.h: + * common/AttributesImpl.h: + * common/Attributes_Def_Builder.h: + * common/CharStream.h: + * common/ContentHandler.h: + * common/DTDHandler.h: + * common/DTD_Manager.h: + * common/DefaultHandler.h: + * common/Element_Def_Builder.h: + * common/Encoding.h: + * common/EntityResolver.h: + * common/ErrorHandler.h: + * common/Exception.h: + * common/HttpCharStream.h: + * common/InputSource.h: + * common/Locator.h: + * common/LocatorImpl.h: + * common/Mem_Map_Stream.h: + * common/NamespaceSupport.h: + * common/SAXExceptions.h: + * common/StrCharStream.h: + * common/StreamFactory.h: + * common/Transcode.h: + * common/URL_Addr.h: + * common/Validator.h: + * common/XMLFilterImpl.h: + * common/XMLReader.h: + Doxygen changes, fix some Klocwork reports + Tue Aug 3 16:50:57 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * common/DTD_Manager.h: diff --git a/ACE/ACEXML/Makefile.am b/ACE/ACEXML/Makefile.am deleted file mode 100644 index 5e025e19d26..00000000000 --- a/ACE/ACEXML/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - common \ - parser \ - examples \ - apps \ - tests - diff --git a/ACE/ACEXML/apps/Makefile.am b/ACE/ACEXML/apps/Makefile.am deleted file mode 100644 index 7f7bf963687..00000000000 --- a/ACE/ACEXML/apps/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - svcconf - diff --git a/ACE/ACEXML/apps/svcconf/Makefile.am b/ACE/ACEXML/apps/svcconf/Makefile.am deleted file mode 100644 index 2464ab3ad33..00000000000 --- a/ACE/ACEXML/apps/svcconf/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ACEXML/apps/svcconf - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ACEXML_XML_Svc_Conf_Parser.am - -if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES = libACEXML_XML_Svc_Conf_Parser.la - -libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ACEXML/common - -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \ - Svcconf.cpp \ - Svcconf_Handler.cpp - -libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \ - $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_XML_Svc_Conf_Parser_la_LIBADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -nobase_include_HEADERS = \ - Svcconf.h \ - Svcconf_Handler.h \ - Svcconf_Handler.inl - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACEXML - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ACEXML/common/Attributes.h b/ACE/ACEXML/common/Attributes.h index 45982ed459e..1e592794cda 100644 --- a/ACE/ACEXML/common/Attributes.h +++ b/ACE/ACEXML/common/Attributes.h @@ -23,7 +23,7 @@ #include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Attributes Attributes.h "ACEXML/common/Attributes.h" + * @class ACEXML_Attributes * * @brief ACEXML_Attributes defines a collection of attributes of an XML element. * diff --git a/ACE/ACEXML/common/AttributesImpl.h b/ACE/ACEXML/common/AttributesImpl.h index 39b7f33099b..a1495bfb75f 100644 --- a/ACE/ACEXML/common/AttributesImpl.h +++ b/ACE/ACEXML/common/AttributesImpl.h @@ -31,7 +31,7 @@ class ACEXML_AttributesImpl; /** - * @class ACEXML_Attribute AttributesImpl.h "ACEXML/common/AttributesImpl.h" + * @class ACEXML_Attribute * * @brief ACEXML_Attribute defines the data structure of an attribute * diff --git a/ACE/ACEXML/common/Attributes_Def_Builder.h b/ACE/ACEXML/common/Attributes_Def_Builder.h index a9986ff754b..cea15d3ebf6 100644 --- a/ACE/ACEXML/common/Attributes_Def_Builder.h +++ b/ACE/ACEXML/common/Attributes_Def_Builder.h @@ -24,7 +24,7 @@ #include "ace/Auto_Ptr.h" /** - * @class ACEXML_Attribute_Def_Builder Attributes_Def_Builder.h "common/Attributes_Def_Builder.h" + * @class ACEXML_Attribute_Def_Builder * * @brief An abstract virtual class defining an interface for building an * attribute definition from DTD. diff --git a/ACE/ACEXML/common/CharStream.h b/ACE/ACEXML/common/CharStream.h index 6c687e91e7c..23fa1af0307 100644 --- a/ACE/ACEXML/common/CharStream.h +++ b/ACE/ACEXML/common/CharStream.h @@ -22,7 +22,7 @@ #include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_CharStream CharStream.h "ACEXML/common/CharStream.h" + * @class ACEXML_CharStream * * ACEXML_CharStream is an abstract class (interface) which defines the * basic opertions a parser could use to retrieve XML charater sequence. diff --git a/ACE/ACEXML/common/ContentHandler.h b/ACE/ACEXML/common/ContentHandler.h index d26cfb22295..6b443f3ff34 100644 --- a/ACE/ACEXML/common/ContentHandler.h +++ b/ACE/ACEXML/common/ContentHandler.h @@ -24,7 +24,7 @@ #include "ACEXML/common/Attributes.h" /** - * @class ACEXML_ContentHandler ContentHandler.h "ACEXML/common/ContentHandler.h" + * @class ACEXML_ContentHandler * * @brief ACEXML_ContentHandler * diff --git a/ACE/ACEXML/common/DTDHandler.h b/ACE/ACEXML/common/DTDHandler.h index 155b8c40f07..6a19452b8bf 100644 --- a/ACE/ACEXML/common/DTDHandler.h +++ b/ACE/ACEXML/common/DTDHandler.h @@ -22,7 +22,7 @@ #include "ACEXML/common/SAXExceptions.h" /** - * @class ACEXML_DTDHandler DTDHandler.h "ACEXML/common/DTDHandler.h" + * @class ACEXML_DTDHandler * * @brief ACEXML_DTDHandler * @@ -58,8 +58,7 @@ public: */ virtual void notationDecl (const ACEXML_Char *name, const ACEXML_Char *publicId, - const ACEXML_Char *systemId) - = 0; + const ACEXML_Char *systemId) = 0; /** * Receive notification of an unparsed entity declaration event. diff --git a/ACE/ACEXML/common/DTD_Manager.h b/ACE/ACEXML/common/DTD_Manager.h index 2b4130eb298..d3847b055c2 100644 --- a/ACE/ACEXML/common/DTD_Manager.h +++ b/ACE/ACEXML/common/DTD_Manager.h @@ -24,7 +24,7 @@ #include "ACEXML/common/Validator.h" /** - * @class ACEXML_DTD_Manager DTD_Manager.h "common/DTD_Manager.h" + * @class ACEXML_DTD_Manager * * @todo Fill in the blank. */ diff --git a/ACE/ACEXML/common/DefaultHandler.h b/ACE/ACEXML/common/DefaultHandler.h index 7b3d6cc7a92..633222f018c 100644 --- a/ACE/ACEXML/common/DefaultHandler.h +++ b/ACE/ACEXML/common/DefaultHandler.h @@ -25,7 +25,7 @@ #include "ACEXML/common/ErrorHandler.h" /** - * @class ACEXML_DefaultHandler DefaultHandler.h "ACEXML/common/DefaultHandler.h" + * @class ACEXML_DefaultHandler * * @brief ACEXML_DefaultHandler * diff --git a/ACE/ACEXML/common/Element_Def_Builder.h b/ACE/ACEXML/common/Element_Def_Builder.h index fa50437b2b4..54d6d9e01c3 100644 --- a/ACE/ACEXML/common/Element_Def_Builder.h +++ b/ACE/ACEXML/common/Element_Def_Builder.h @@ -24,7 +24,7 @@ #include "ACEXML/common/SAXExceptions.h" /** - * @class ACEXML_Element_Def_Builder Element_Def_Builder.h "common/Element_Def_Builder.h" + * @class ACEXML_Element_Def_Builder * * @brief An abstract virtual class that defines the interface to define an * element definition. diff --git a/ACE/ACEXML/common/Encoding.h b/ACE/ACEXML/common/Encoding.h index 3e957fabbe1..e4de4e3782c 100644 --- a/ACE/ACEXML/common/Encoding.h +++ b/ACE/ACEXML/common/Encoding.h @@ -26,7 +26,7 @@ #include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Encoding Encoding.h "ACEXML/common/Encoding.h" + * @class ACEXML_Encoding Encoding.h * * @brief ACEXML_Encoding * diff --git a/ACE/ACEXML/common/EntityResolver.h b/ACE/ACEXML/common/EntityResolver.h index c18708b029a..26bc722e79b 100644 --- a/ACE/ACEXML/common/EntityResolver.h +++ b/ACE/ACEXML/common/EntityResolver.h @@ -23,7 +23,7 @@ #include "ACEXML/common/SAXExceptions.h" /** - * @class ACEXML_EntityResolver EntityResolver.h "ACEXML/common/EntityResolver.h" + * @class ACEXML_EntityResolver * * @brief ACEXML_EntityResolver * diff --git a/ACE/ACEXML/common/ErrorHandler.h b/ACE/ACEXML/common/ErrorHandler.h index 5ba981bbcb4..b1a410344fc 100644 --- a/ACE/ACEXML/common/ErrorHandler.h +++ b/ACE/ACEXML/common/ErrorHandler.h @@ -22,7 +22,7 @@ #include "ACEXML/common/SAXExceptions.h" /** - * @class ACEXML_ErrorHandler ErrorHandler.h "ACEXML/common/ErrorHandler.h" + * @class ACEXML_ErrorHandler * * @brief ACEXML_ErrorHandler * diff --git a/ACE/ACEXML/common/Exception.h b/ACE/ACEXML/common/Exception.h index 56ba88f1566..ebbab9d379e 100644 --- a/ACE/ACEXML/common/Exception.h +++ b/ACE/ACEXML/common/Exception.h @@ -23,7 +23,7 @@ #include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Exception Exception.h "ACEXML/common/Exception.h" + * @class ACEXML_Exception * * @brief ACEXML_Exception * @@ -59,7 +59,7 @@ public: virtual void print (void) const = 0; protected: - /// Default contructor. + /// Default constructor. ACEXML_Exception (void); /// All exceptions have names. This name is used to identify the diff --git a/ACE/ACEXML/common/HttpCharStream.h b/ACE/ACEXML/common/HttpCharStream.h index 593205bec7c..dc4b702f95b 100644 --- a/ACE/ACEXML/common/HttpCharStream.h +++ b/ACE/ACEXML/common/HttpCharStream.h @@ -25,7 +25,7 @@ #include "ACEXML/common/Mem_Map_Stream.h" /** - * @class ACEXML_HttpCharStream HttpCharStream.h "ACEXML/common/HttpCharStream.h" + * @class ACEXML_HttpCharStream * * An implementation of ACEXML_CharStream for reading input from a URL. */ diff --git a/ACE/ACEXML/common/InputSource.h b/ACE/ACEXML/common/InputSource.h index ae2b70b130e..e8d8f289dd4 100644 --- a/ACE/ACEXML/common/InputSource.h +++ b/ACE/ACEXML/common/InputSource.h @@ -21,9 +21,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ACEXML/common/CharStream.h" +#include "ace/Copy_Disabled.h" /** - * @class ACEXML_InputSource InputSource.h "ACEXML/common/InputSource.h" + * @class ACEXML_InputSource * * @brief ACEXML_InputSource encapsulates the actual input stream with some * added information. @@ -50,7 +51,7 @@ * * @sa ACEXML_CharStream */ -class ACEXML_Export ACEXML_InputSource +class ACEXML_Export ACEXML_InputSource : private ACE_Copy_Disabled { public: /** diff --git a/ACE/ACEXML/common/Locator.h b/ACE/ACEXML/common/Locator.h index c6504b706a4..c453a351b98 100644 --- a/ACE/ACEXML/common/Locator.h +++ b/ACE/ACEXML/common/Locator.h @@ -18,7 +18,7 @@ #include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Locator Locator.h "ACEXML/common/Locator.h" + * @class ACEXML_Locator * * @brief ACEXML_Locator defines operations that an XML locator should support. * diff --git a/ACE/ACEXML/common/LocatorImpl.h b/ACE/ACEXML/common/LocatorImpl.h index 46a7092c84f..e315b45f6d6 100644 --- a/ACE/ACEXML/common/LocatorImpl.h +++ b/ACE/ACEXML/common/LocatorImpl.h @@ -22,9 +22,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ACEXML/common/Locator.h" +#include "ace/Copy_Disabled.h" /** - * @class ACEXML_LocatorImpl LocatorImpl.h "ACEXML/common/LocatorImpl.h" + * @class ACEXML_LocatorImpl * * @brief ACEXML_LocatorImpl is an implementation of ACEXML_Locator. * @@ -58,7 +59,9 @@ * * @sa ACEXML_Locator */ -class ACEXML_Export ACEXML_LocatorImpl : public ACEXML_Locator +class ACEXML_Export ACEXML_LocatorImpl : + public ACEXML_Locator, + private ACE_Copy_Disabled { public: /* diff --git a/ACE/ACEXML/common/Makefile.am b/ACE/ACEXML/common/Makefile.am deleted file mode 100644 index 9b6a2200f8c..00000000000 --- a/ACE/ACEXML/common/Makefile.am +++ /dev/null @@ -1,155 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ACEXML/common -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ACEXML.am - -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES = libACEXML.la - -libACEXML_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACEXML_BUILD_DLL - -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_la_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -libACEXML_la_SOURCES = \ - Attributes.cpp \ - AttributesImpl.cpp \ - Attributes_Def_Builder.cpp \ - CharStream.cpp \ - ContentHandler.cpp \ - DTDHandler.cpp \ - DTD_Manager.cpp \ - DefaultHandler.cpp \ - Element_Def_Builder.cpp \ - Encoding.cpp \ - EntityResolver.cpp \ - ErrorHandler.cpp \ - Exception.cpp \ - FileCharStream.cpp \ - HttpCharStream.cpp \ - InputSource.cpp \ - Locator.cpp \ - LocatorImpl.cpp \ - Mem_Map_Stream.cpp \ - NamespaceSupport.cpp \ - SAXExceptions.cpp \ - StrCharStream.cpp \ - StreamFactory.cpp \ - Transcode.cpp \ - URL_Addr.cpp \ - Validator.cpp \ - XMLFilterImpl.cpp \ - XMLReader.cpp \ - XML_Codecs.cpp \ - XML_Util.cpp \ - ZipCharStream.cpp - -libACEXML_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -libACEXML_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_la_LIBADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -nobase_include_HEADERS = \ - ACEXML_Export.h \ - Attributes.h \ - AttributesImpl.h \ - AttributesImpl.inl \ - Attributes_Def_Builder.h \ - CharStream.h \ - ContentHandler.h \ - DTDHandler.h \ - DTD_Manager.h \ - DefaultHandler.h \ - Element_Def_Builder.h \ - Encoding.h \ - EntityResolver.h \ - ErrorHandler.h \ - Exception.h \ - Exception.inl \ - FileCharStream.h \ - HttpCharStream.h \ - InputSource.h \ - Locator.h \ - LocatorImpl.h \ - LocatorImpl.inl \ - Mem_Map_Stream.h \ - NamespaceSupport.h \ - SAXExceptions.h \ - SAXExceptions.inl \ - StrCharStream.h \ - StreamFactory.h \ - Transcode.h \ - URL_Addr.h \ - URL_Addr.inl \ - Validator.h \ - XMLFilter.h \ - XMLFilterImpl.h \ - XMLFilterImpl.inl \ - XMLReader.h \ - XML_Codecs.h \ - XML_Types.h \ - XML_Util.h \ - ZipCharStream.h - -pkgconfig_DATA = \ - ACEXML.pc - -CLEANFILES = \ - ACEXML.pc - -ACEXML.pc: ${top_builddir}/config.status ${srcdir}/ACEXML.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACEXML.pc.in - -endif !BUILD_ACE_FOR_TAO - -EXTRA_DIST = \ - ACEXML.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ACEXML/common/Mem_Map_Stream.h b/ACE/ACEXML/common/Mem_Map_Stream.h index 3752c71d104..aa98b1c4658 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.h +++ b/ACE/ACEXML/common/Mem_Map_Stream.h @@ -30,7 +30,7 @@ typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> Svc_Handler; typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> Connector; /** - * @class ACEXML_Mem_Map_Stream Mem_Map_Stream.h "ACEXML/common/Mem_Map_Stream.h" + * @class ACEXML_Mem_Map_Stream * * @brief Provides a memory-mapped stream abstraction to simplify parsing * of tokens. diff --git a/ACE/ACEXML/common/NamespaceSupport.h b/ACE/ACEXML/common/NamespaceSupport.h index d81f9303d70..cac79e19643 100644 --- a/ACE/ACEXML/common/NamespaceSupport.h +++ b/ACE/ACEXML/common/NamespaceSupport.h @@ -52,7 +52,7 @@ typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String, typedef ACE_Unbounded_Queue<const ACEXML_Char *> ACEXML_STR_LIST; /** - * @class ACEXML_Namespace_Context_Stack NamespaceSupport.h "ACEXML/common/NamespaceSupport.h" + * @class ACEXML_Namespace_Context_Stack * * @brief ACEXML_Namespace_Context_Stack implements a simple stack * that ACEXML_NamespaceSupport uses to keep track of namespace scopes. diff --git a/ACE/ACEXML/common/SAXExceptions.h b/ACE/ACEXML/common/SAXExceptions.h index ae117ff7bc5..ac7cf70b1ab 100644 --- a/ACE/ACEXML/common/SAXExceptions.h +++ b/ACE/ACEXML/common/SAXExceptions.h @@ -23,7 +23,7 @@ #include "ACEXML/common/Exception.h" /** - * @class ACEXML_SAXException SAXExceptions.h "ACEXML/common/SAXExceptions.h" + * @class ACEXML_SAXException * * @brief ACEXML_SAXException * diff --git a/ACE/ACEXML/common/StrCharStream.h b/ACE/ACEXML/common/StrCharStream.h index 21de6ecaea4..22b9d9a5acd 100644 --- a/ACE/ACEXML/common/StrCharStream.h +++ b/ACE/ACEXML/common/StrCharStream.h @@ -23,7 +23,7 @@ #include "ACEXML/common/CharStream.h" /** - * @class ACEXML_StrCharStream StrCharStream.h "common/StrCharStream.h" + * @class ACEXML_StrCharStream * * An implementation of ACEXML_CharStream for reading * input from a null-terminated ACEXML_Char string. diff --git a/ACE/ACEXML/common/StreamFactory.h b/ACE/ACEXML/common/StreamFactory.h index 9391eb6a299..492eb7872f8 100644 --- a/ACE/ACEXML/common/StreamFactory.h +++ b/ACE/ACEXML/common/StreamFactory.h @@ -23,7 +23,7 @@ class ACEXML_CharStream; /** - * @class ACEXML_StreamFactory StreamFactory.h "ACEXML/common/ACEXML_StreamFactory.h" + * @class ACEXML_StreamFactory * * @brief A generic factory used to create an appropriate @sa * ACEXML_CharStream from a SYSTEM id. This class creates a @sa diff --git a/ACE/ACEXML/common/Transcode.h b/ACE/ACEXML/common/Transcode.h index 1acf294c7aa..fc20efb6db9 100644 --- a/ACE/ACEXML/common/Transcode.h +++ b/ACE/ACEXML/common/Transcode.h @@ -26,7 +26,7 @@ #include "ACEXML/common/XML_Types.h" /** - * @class ACEXML_Transcoder Transcode.h "ACEXML/common/Transcode.h" + * @class ACEXML_Transcoder * * @brief ACEXML_Transcoder * diff --git a/ACE/ACEXML/common/URL_Addr.h b/ACE/ACEXML/common/URL_Addr.h index 3c6145c2c0d..687cba7751e 100644 --- a/ACE/ACEXML/common/URL_Addr.h +++ b/ACE/ACEXML/common/URL_Addr.h @@ -25,7 +25,7 @@ #include "ACEXML/common/ACEXML_Export.h" /** - * @class ACEXML_URL_Addr URL_Addr.h "ACEXML/common/URL_Addr.h" + * @class ACEXML_URL_Addr * * Defines a URL address family address format. */ diff --git a/ACE/ACEXML/common/Validator.h b/ACE/ACEXML/common/Validator.h index 79d7ad88356..8f646e2aa9d 100644 --- a/ACE/ACEXML/common/Validator.h +++ b/ACE/ACEXML/common/Validator.h @@ -23,7 +23,7 @@ #include "ACEXML/common/SAXExceptions.h" /** - * @class ACEXML_Validator Validator.h "common/Validator.h" + * @class ACEXML_Validator * * @brief An abstract virtual class defining validator interface. * diff --git a/ACE/ACEXML/common/XMLFilterImpl.h b/ACE/ACEXML/common/XMLFilterImpl.h index 39e51b00d20..95ec618c4d5 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.h +++ b/ACE/ACEXML/common/XMLFilterImpl.h @@ -22,7 +22,7 @@ #include "ACEXML/common/ErrorHandler.h" /** - * @class ACEXML_XMLFilterImpl XMLFilterImpl.h "ACEXML/common/XMLFilterImpl.h" + * @class ACEXML_XMLFilterImpl * * @brief ACEXML_XMLFilterImpl * diff --git a/ACE/ACEXML/common/XMLReader.h b/ACE/ACEXML/common/XMLReader.h index 95b03f62142..abca5198f72 100644 --- a/ACE/ACEXML/common/XMLReader.h +++ b/ACE/ACEXML/common/XMLReader.h @@ -25,7 +25,7 @@ #include "ACEXML/common/ErrorHandler.h" /** - * @class ACEXML_XMLReader XMLReader.h "ACEXML/common/XMLReader.h" + * @class ACEXML_XMLReader * * @brief ACEXML_XMLReader * diff --git a/ACE/ACEXML/docs/TODO.txt b/ACE/ACEXML/docs/TODO.txt index e7e48ca67c4..02795c13394 100644 --- a/ACE/ACEXML/docs/TODO.txt +++ b/ACE/ACEXML/docs/TODO.txt @@ -1,4 +1,7 @@ /** + +$Id$ + @page acexml_todo ACEXML TO-DO List <ul> diff --git a/ACE/ACEXML/docs/bugs.txt b/ACE/ACEXML/docs/bugs.txt index 136e0cd7117..2fd0a8d5c02 100644 --- a/ACE/ACEXML/docs/bugs.txt +++ b/ACE/ACEXML/docs/bugs.txt @@ -1,4 +1,7 @@ /** + +$Id$ + @page acexml_bugs ACEXML Known Bugs <ul> diff --git a/ACE/ACEXML/docs/readme.txt b/ACE/ACEXML/docs/readme.txt index f0de833b526..c366d6c6cde 100644 --- a/ACE/ACEXML/docs/readme.txt +++ b/ACE/ACEXML/docs/readme.txt @@ -1,4 +1,7 @@ /** -*- HTML-Helper -*- $Id$ + +$Id$ + @mainpage ACEXML - A Small and Portable XML Parser @section acexml_synopsis Synopsis diff --git a/ACE/ACEXML/examples/Makefile.am b/ACE/ACEXML/examples/Makefile.am deleted file mode 100644 index 0ddb642570a..00000000000 --- a/ACE/ACEXML/examples/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - SAXPrint - diff --git a/ACE/ACEXML/examples/SAXPrint/Makefile.am b/ACE/ACEXML/examples/SAXPrint/Makefile.am deleted file mode 100644 index d196510359f..00000000000 --- a/ACE/ACEXML/examples/SAXPrint/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.SAXPrint.am - -if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = SAXPrint - -SAXPrint_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ACEXML/common - -if BUILD_ZLIB -if BUILD_ZZIP -SAXPrint_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -SAXPrint_SOURCES = \ - Print_Handler.cpp \ - SAXPrint_Handler.cpp \ - main.cpp \ - Print_Handler.h \ - SAXPrint_Handler.h \ - SAXPrint_Handler.inl - -SAXPrint_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -SAXPrint_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -SAXPrint_LDADD = \ - $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -SAXPrint_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACEXML - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ACEXML/examples/SAXPrint/broken.xml b/ACE/ACEXML/examples/SAXPrint/broken.xml index 8c350cc24fe..2265e7c55ed 100644 --- a/ACE/ACEXML/examples/SAXPrint/broken.xml +++ b/ACE/ACEXML/examples/SAXPrint/broken.xml @@ -1,3 +1,7 @@ +<!-- --> +<!-- $Id$ --> +<!-- --> + <?xml version="1.0"?> <!-- This is a broken XML file. Most of the stuff here don't make any sense at all --> diff --git a/ACE/ACEXML/examples/SAXPrint/namespaces.xml b/ACE/ACEXML/examples/SAXPrint/namespaces.xml index f2418848929..e00209f2c4d 100644 --- a/ACE/ACEXML/examples/SAXPrint/namespaces.xml +++ b/ACE/ACEXML/examples/SAXPrint/namespaces.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="iso8859-1"?> +<!-- --> +<!-- $Id$ --> +<!-- --> + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/" xmlns="http://purl.org/rss/1.0/"> <channel rdf:about="http://primates.ximian.com/~ravi/BoozeLog/"> diff --git a/ACE/ACEXML/examples/SAXPrint/ns.svc.conf.xml b/ACE/ACEXML/examples/SAXPrint/ns.svc.conf.xml index 980ef21de92..a25133f7b44 100644 --- a/ACE/ACEXML/examples/SAXPrint/ns.svc.conf.xml +++ b/ACE/ACEXML/examples/SAXPrint/ns.svc.conf.xml @@ -1,4 +1,8 @@ <?xml version="1.0"?> +<!-- --> +<!-- $Id$ --> +<!-- --> + <ace:ACE_Svc_Conf xmlns="http://ace.doc.wustl.edu/svcconf" xmlns:ace="http://ace.doc.wustl.edu/svcconf"> <static id="ACE_Service_Manager"> <params>-d</params> diff --git a/ACE/ACEXML/examples/SAXPrint/simple.svcconf.xml b/ACE/ACEXML/examples/SAXPrint/simple.svcconf.xml index 32afe359fdb..c7b5287b3ed 100644 --- a/ACE/ACEXML/examples/SAXPrint/simple.svcconf.xml +++ b/ACE/ACEXML/examples/SAXPrint/simple.svcconf.xml @@ -1,4 +1,9 @@ <ACE_Svc_Conf> + +<!-- --> +<!-- $Id$ --> +<!-- --> + <static id="ACE_Service_Manager" params="-d -p 4911"/> <dynamic id="Test_Task" type="service_object"> A & diff --git a/ACE/ACEXML/examples/SAXPrint/svc.conf.xml b/ACE/ACEXML/examples/SAXPrint/svc.conf.xml index 5296e5cac35..846c2a91b7f 100644 --- a/ACE/ACEXML/examples/SAXPrint/svc.conf.xml +++ b/ACE/ACEXML/examples/SAXPrint/svc.conf.xml @@ -1,4 +1,9 @@ <?xml version="1.0"?> + +<!-- --> +<!-- $Id$ --> +<!-- --> + <!-- This is a test XML file. Most of the stuff here don't make any sense at all --> <!DOCTYPE ACE_Svc_Conf PUBLIC 'GOODSAM' '../../apps/svcconf/svcconf.dtd' [ diff --git a/ACE/ACEXML/parser/Makefile.am b/ACE/ACEXML/parser/Makefile.am deleted file mode 100644 index 35c60abcb8d..00000000000 --- a/ACE/ACEXML/parser/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - parser - diff --git a/ACE/ACEXML/parser/parser/Makefile.am b/ACE/ACEXML/parser/parser/Makefile.am deleted file mode 100644 index f4440e30faf..00000000000 --- a/ACE/ACEXML/parser/parser/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ACEXML/parser/parser -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ACEXML_Parser.am - -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES = libACEXML_Parser.la - -libACEXML_Parser_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACEXML_PARSER_BUILD_DLL - -libACEXML_Parser_la_SOURCES = \ - Entity_Manager.cpp \ - Parser.cpp \ - ParserContext.cpp \ - ParserInternals.cpp - -libACEXML_Parser_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACEXML_Parser_la_LIBADD = \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - Entity_Manager.h \ - Entity_Manager.inl \ - Parser.h \ - Parser.inl \ - ParserContext.h \ - ParserContext.inl \ - ParserInternals.h \ - Parser_export.h - -pkgconfig_DATA = \ - ACEXML_Parser.pc - -CLEANFILES = \ - ACEXML_Parser.pc - -ACEXML_Parser.pc: ${top_builddir}/config.status ${srcdir}/ACEXML_Parser.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACEXML_Parser.pc.in - -endif !BUILD_ACE_FOR_TAO - -EXTRA_DIST = \ - ACEXML_Parser.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp index e86d2bde39f..fc6d4899e6e 100644 --- a/ACE/ACEXML/parser/parser/Parser.cpp +++ b/ACE/ACEXML/parser/parser/Parser.cpp @@ -1735,7 +1735,7 @@ ACEXML_Parser::parse_child (int skip_open_paren) } ACEXML_Char node_type = 0; - ACEXML_Char nextch; + ACEXML_Char nextch = 0; do { this->check_for_PE_reference (); diff --git a/ACE/ACEXML/tests/Makefile.am b/ACE/ACEXML/tests/Makefile.am deleted file mode 100644 index e8f43fdc317..00000000000 --- a/ACE/ACEXML/tests/Makefile.am +++ /dev/null @@ -1,222 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - util - -noinst_PROGRAMS = - -## Makefile.ContentHandler_Test.am - -if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += ContentHandler_Test - -ContentHandler_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ACEXML/common - -if BUILD_ZLIB -if BUILD_ZZIP -ContentHandler_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -ContentHandler_Test_SOURCES = \ - ContentHandler_Test.cpp - -ContentHandler_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -ContentHandler_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -ContentHandler_Test_LDADD = \ - $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -ContentHandler_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACEXML - -## Makefile.HttpCharStream_Test.am - -if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += HttpCharStream_Test - -HttpCharStream_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ACEXML/common - -if BUILD_ZLIB -if BUILD_ZZIP -HttpCharStream_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -HttpCharStream_Test_SOURCES = \ - HttpCharStream_Test.cpp - -HttpCharStream_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -HttpCharStream_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -HttpCharStream_Test_LDADD = \ - $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -HttpCharStream_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACEXML - -## Makefile.NamespaceSupport_Test.am - -if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += NamespaceSupport_Test - -NamespaceSupport_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ACEXML/common - -if BUILD_ZLIB -if BUILD_ZZIP -NamespaceSupport_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -NamespaceSupport_Test_SOURCES = \ - NamespaceSupport_Test.cpp - -NamespaceSupport_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -NamespaceSupport_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -NamespaceSupport_Test_LDADD = \ - $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -NamespaceSupport_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACEXML - -## Makefile.Transcoder_Test.am - -if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Transcoder_Test - -Transcoder_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ACEXML/common - -if BUILD_ZLIB -if BUILD_ZZIP -Transcoder_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -Transcoder_Test_SOURCES = \ - Transcoder_Test.cpp - -Transcoder_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -Transcoder_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -Transcoder_Test_LDADD = \ - $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -Transcoder_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACEXML - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ACEXML/tests/util/Makefile.am b/ACE/ACEXML/tests/util/Makefile.am deleted file mode 100644 index b2d79bef425..00000000000 --- a/ACE/ACEXML/tests/util/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.util.am - -if BUILD_ACEXML -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ACEXML/common - -if BUILD_ZLIB -if BUILD_ZZIP -test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -test_SOURCES = \ - test.cpp - -test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -test_LDADD = \ - $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ - $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -if BUILD_ZLIB -if BUILD_ZZIP -test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACEXML - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/Makefile.am b/ACE/ASNMP/Makefile.am deleted file mode 100644 index 7ff1160c8a3..00000000000 --- a/ACE/ASNMP/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - asnmp \ - agent \ - examples \ - tests - diff --git a/ACE/ASNMP/README b/ACE/ASNMP/README index 83885971956..14c8d2f8d57 100644 --- a/ACE/ASNMP/README +++ b/ACE/ASNMP/README @@ -1,4 +1,5 @@ -Fri Dec 18 09:43:35 CST 1998 +$Id$ + ==================================================================== ASNMP = ACE+SNMP++ Version 2.1 By Michael R. MacFaden mrm@acm.org, mrm@yagosys.com diff --git a/ACE/ASNMP/agent/Makefile.am b/ACE/ASNMP/agent/Makefile.am deleted file mode 100644 index afb76da40ed..00000000000 --- a/ACE/ASNMP/agent/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.asnmp_agent.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = agent - -agent_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -agent_SOURCES = \ - agent_impl.cpp \ - main.cpp \ - snmp_agent.cpp \ - agent_impl.h \ - snmp_agent.h - -agent_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/asnmp/Makefile.am b/ACE/ASNMP/asnmp/Makefile.am deleted file mode 100644 index 7b117dab9f6..00000000000 --- a/ACE/ASNMP/asnmp/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.asnmp_lib.am - -noinst_LTLIBRARIES = libasnmp.la - -libasnmp_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP \ - -DASNMP_BUILD_DLL - -libasnmp_la_SOURCES = \ - address.cpp \ - asn1.cpp \ - counter.cpp \ - ctr64.cpp \ - gauge.cpp \ - integer.cpp \ - octet.cpp \ - oid.cpp \ - pdu.cpp \ - sagent.cpp \ - snmp.cpp \ - target.cpp \ - timetick.cpp \ - transaction.cpp \ - vb.cpp \ - wpdu.cpp - -noinst_HEADERS = \ - address.h \ - asn1.h \ - counter.h \ - ctr64.h \ - gauge.h \ - integer.h \ - octet.h \ - oid.h \ - pdu.h \ - sagent.h \ - snmp.h \ - target.h \ - timetick.h \ - transaction.h \ - vb.h \ - wpdu.h - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/examples/Makefile.am b/ACE/ASNMP/examples/Makefile.am deleted file mode 100644 index ba48f01c667..00000000000 --- a/ACE/ASNMP/examples/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - get \ - next \ - set \ - trap \ - walk - diff --git a/ACE/ASNMP/examples/get/Makefile.am b/ACE/ASNMP/examples/get/Makefile.am deleted file mode 100644 index 0c3a6e4ea95..00000000000 --- a/ACE/ASNMP/examples/get/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.asnmp_example_get.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += get - -get_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -get_SOURCES = \ - get.cpp - -get_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.asnmp_example_get_async.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += get_async - -get_async_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -get_async_SOURCES = \ - get_async.cpp - -get_async_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/examples/next/Makefile.am b/ACE/ASNMP/examples/next/Makefile.am deleted file mode 100644 index a7b4c2a1256..00000000000 --- a/ACE/ASNMP/examples/next/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.asnmp_example_next.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = next - -next_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -next_SOURCES = \ - next.cpp - -next_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/examples/set/Makefile.am b/ACE/ASNMP/examples/set/Makefile.am deleted file mode 100644 index 94f708ec8e1..00000000000 --- a/ACE/ASNMP/examples/set/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.asnmp_example_set.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = set - -set_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -set_SOURCES = \ - set.cpp - -set_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/examples/trap/Makefile.am b/ACE/ASNMP/examples/trap/Makefile.am deleted file mode 100644 index a60adce7d30..00000000000 --- a/ACE/ASNMP/examples/trap/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.asnmp_example_trap.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = trap - -trap_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -trap_SOURCES = \ - trap.cpp - -trap_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/examples/walk/Makefile.am b/ACE/ASNMP/examples/walk/Makefile.am deleted file mode 100644 index 9cff32a49de..00000000000 --- a/ACE/ASNMP/examples/walk/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.asnmp_example_walk.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = walk - -walk_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -walk_SOURCES = \ - walk.cpp - -walk_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/tests/Makefile.am b/ACE/ASNMP/tests/Makefile.am deleted file mode 100644 index b8ac30972bf..00000000000 --- a/ACE/ASNMP/tests/Makefile.am +++ /dev/null @@ -1,173 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.asnmp_tests_Address_Test.am - -noinst_PROGRAMS = Address_Test - -Address_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Address_Test_SOURCES = \ - Address_Test.cpp \ - test_config.h - -Address_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Counter64_Test.am - -noinst_PROGRAMS += Counter64_Test - -Counter64_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Counter64_Test_SOURCES = \ - Counter64_Test.cpp \ - test_config.h - -Counter64_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Counter_Test.am - -noinst_PROGRAMS += Counter_Test - -Counter_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Counter_Test_SOURCES = \ - Counter_Test.cpp \ - test_config.h - -Counter_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Gauge_Test.am - -noinst_PROGRAMS += Gauge_Test - -Gauge_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Gauge_Test_SOURCES = \ - Gauge_Test.cpp \ - test_config.h - -Gauge_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Integer_Test.am - -noinst_PROGRAMS += Integer_Test - -Integer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Integer_Test_SOURCES = \ - Integer_Test.cpp \ - test_config.h - -Integer_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Octet_Test.am - -noinst_PROGRAMS += Octet_Test - -Octet_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Octet_Test_SOURCES = \ - Octet_Test.cpp \ - test_config.h - -Octet_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Oid_Test.am - -noinst_PROGRAMS += Oid_Test - -Oid_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Oid_Test_SOURCES = \ - Oid_Test.cpp \ - test_config.h - -Oid_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Target_Test.am - -noinst_PROGRAMS += Target_Test - -Target_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Target_Test_SOURCES = \ - Target_Test.cpp \ - test_config.h - -Target_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.asnmp_tests_Varbind_Test.am - -noinst_PROGRAMS += Varbind_Test - -Varbind_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/ASNMP - -Varbind_Test_SOURCES = \ - Varbind_Test.cpp \ - test_config.h - -Varbind_Test_LDADD = \ - $(top_builddir)/ASNMP/asnmp/libasnmp.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ASNMP/tests/run_tests.sh b/ACE/ASNMP/tests/run_tests.sh index 19a1ca957f7..74e7e66036a 100755 --- a/ACE/ASNMP/tests/run_tests.sh +++ b/ACE/ASNMP/tests/run_tests.sh @@ -1,4 +1,7 @@ #!/bin/sh + +# $Id$ + # This is the UNIX version of the one-button ACE tests. # Contributed by Michael Rueger <m_rueger@SYSCOMP.DE> # mrm@cisco.com - Change to for loop script could be more generic if we put diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ad237f9b3c7..ddc41b52d64 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,213 @@ +Sat Oct 22 02:06:37 UTC 2011 Abdullah Sowayan <sowayan@gmail.com> + + * include/makeinclude/platform_macosx_common.GNU: + + Added missing: + DCCFLAGS += -g + + From the file. Thanks to William R. Otte <wotte@dre.vanderbilt.edu> + for pointing this out. + +Fri Oct 21 23:35:30 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * ace/Time_Value.inl: + + Changed the operator comparing __builtin_constant_p to be a + bitwise (&) instead oflogical and (&&) to address a warning from the + LLVM compiler. In this case, the result of the two operators is + logically equivalent. Thanks to Abdullah Sowayan <sowayan@gmail.com> + for reporting the issue. + +Fri Oct 21 11:26:49 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * examples/Misc/test_trace.cpp: + Fixed compile issue in case all logging is turned off. + +Thu Oct 20 10:41:44 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/Download.html: + Added links to the OBS projects, thanks to John Fletcher for providing + this update + +Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Tue Oct 18 09:23:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * bin/MakeProjectCreator/config/global.features: + Add ccm_direct_collocation + + Wed Oct 12 13:08:13 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/MakeProjectCreator/config/crosscompile.mpb: + Fixed install issues. + + * bin/mwc.pl: + Removed unnecessary STDERR. + + === end changelog === + +Thu Oct 20 06:57:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * *.*: + Removed autoconf support due to lack of resources/funding to + get autoconf really working. It now only causes confusions and + not working configurations for users. + +Wed Oct 19 19:13:38 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/global.features: + disable openmp by default. + + * include/makeinclude/platform_clang_common.GNU: + * include/makeinclude/platform_g++_common.GNU: + add flags for openmp. + +Wed Oct 19 09:56:20 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * rpmbuild/ace-tao.spec: + Removed not needed setting of inline + +Mon Oct 17 20:40:35 UTC 2011 Abdul Sowayan <sowayan@gmail.com> + + * include/makeinclude/platform_macosx_iOS.GNU: + + Minor enhancements to this file to make ACE/TAO compile again. + +Sat Oct 15 00:57:11 UTC 2011 Abdullah Sowayan <sowayan@gmail.com> + + * ace/config-macosx-lion.h: + * include/makeinclude/platform_macosx_lion.GNU: + + Minor enhancements to the files above. + +Mon Oct 10 12:13:52 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * protocols/ace/INet/ClientRequestHandler.h: + * protocols/ace/INet/HTTP_ClientRequestHandler.h: + * protocols/ace/INet/URLBase.h: + Always export, should solve SLE9 issues + +Mon Oct 10 11:16:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/Download.html: + Make x.0.5 public + +Mon Oct 10 11:16:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/diff-builds-and-group-fixed-tests-only.sh: + Updated for next release + + * bin/make_release.py: + Next time we don't ship vc8 anymore + + * docs/bczar/bczar.html: + Make x.0.5 public + + * etc/index.html: + Make x.0.5 public + +Mon Oct 10 08:48:51 CEST 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE version 6.0.5 released. + +Sat Oct 8 09:00:00 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ACEXML/examples/SAXPrint/namespaces.xml: + * ACEXML/examples/SAXPrint/ns.svc.conf.xml: + * ACEXML/examples/SAXPrint/simple.svcconf.xml: + * ACEXML/examples/SAXPrint/svc.conf.xml: + XML does not allow anything before the xml-tag. + +Fri Oct 7 09:45:31 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ACEXML/docs/TODO.txt: + * ACEXML/docs/bugs.txt: + * ASNMP/tests/run_tests.sh: + Fuzz + +Fri Oct 7 09:10:55 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ACEXML/docs/readme.txt: + * ASNMP/README: + * Kokyu/README: + * bin/LabVIEW_RT/README: + * bin/PerlACE/README: + * contrib/FaCE/README: + * examples/C++NPv1/README: + * examples/C++NPv2/README: + * examples/IPC_SAP/SSL_SAP/README: + * examples/Semaphores/README: + * html/README: + * netsvcs/lib/README: + * performance-tests/README: + * performance-tests/RPC/README: + * performance-tests/Synch-Benchmarks/Perf_Test/README: + * performance-tests/Synch-Benchmarks/README: + * performance-tests/Synch-Benchmarks/Synch_Lib/README: + * performance-tests/TCP/README: + * performance-tests/TTCP/C/README: + * performance-tests/UDP/README: + * protocols/ace/HTBP/README: + * websvcs/README: + Fuzz: No id-tags. Also uniform way of declaring the Id-tags + +Fri Oct 7 07:48:32 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ACEXML/examples/SAXPrint/broken.xml: + * ACEXML/examples/SAXPrint/namespaces.xml: + * ACEXML/examples/SAXPrint/ns.svc.conf.xml: + * ACEXML/examples/SAXPrint/simple.svcconf.xml: + * ACEXML/examples/SAXPrint/svc.conf.xml: + * Kokyu/tests/DSRT_MIF/svc.conf.xml: + * examples/ASX/CCM_App/svc.conf.xml: + * netsvcs/servers/svc.conf.xml: + * tests/Service_Config_Test.conf.xml: + Fuzz: No Id-tags. + +Thu Oct 6 12:01:30 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * netsvcs/README: + * netsvcs/clients/Logger/README: + * netsvcs/clients/README: + * netsvcs/clients/Tokens/README: + * netsvcs/clients/Tokens/collection/README: + * netsvcs/clients/Tokens/deadlock/README: + * netsvcs/clients/Tokens/invariant/README: + * netsvcs/clients/Tokens/manual/README: + * netsvcs/clients/Tokens/mutex/README: + * netsvcs/lib/README: + * netsvcs/servers/README: + Fuzz: trailing whitespaces, tab characters and ID strings + +Thu Oct 6 11:56:19 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * README: + * examples/Connection/non_blocking/README: + * examples/IPC_SAP/DEV_SAP/README: + * examples/IPC_SAP/SOCK_SAP/README: + * examples/IPC_SAP/SSL_SAP/README: + * examples/Log_Msg/Log_Msg_MFC/README: + * examples/Log_Msg/README: + * examples/Logger/README: + * examples/README: + * examples/Reactor/Ntalker/README: + * examples/Reactor/README: + * examples/Reactor/TP_Reactor/README: + * examples/Service_Configurator/Misc/README: + * examples/Synch/README: + * examples/System_V_IPC/README: + * examples/Timer_Queue/README: + Fuzz: trailing whitespaces, tab characters and ID strings + +Mon Oct 3 06:30:57 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Dev_Poll_Reactor.h: + Doxygen improvements + Fri Sep 30 14:03:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * bin/fuzz.pl: diff --git a/ACE/Kokyu/Makefile.am b/ACE/Kokyu/Makefile.am deleted file mode 100644 index 86deb01005e..00000000000 --- a/ACE/Kokyu/Makefile.am +++ /dev/null @@ -1,87 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/Kokyu -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - tests - -## Makefile.Kokyu.am - -lib_LTLIBRARIES = libKokyu.la - -libKokyu_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DKOKYU_BUILD_DLL - -libKokyu_la_SOURCES = \ - Default_Dispatcher_Impl.cpp \ - Dispatcher_Impl.cpp \ - Dispatcher_Task.cpp \ - Kokyu.cpp \ - Kokyu_defs.cpp - -libKokyu_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libKokyu_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - DSRT_Direct_Dispatcher_Impl_T.cpp \ - DSRT_Direct_Dispatcher_Impl_T.h \ - DSRT_Dispatch_Item_T.cpp \ - DSRT_Dispatch_Item_T.h \ - DSRT_Dispatch_Item_T.inl \ - DSRT_Dispatcher_Impl_T.cpp \ - DSRT_Dispatcher_Impl_T.h \ - DSRT_Dispatcher_Impl_T.inl \ - DSRT_Sched_Queue_T.cpp \ - DSRT_Sched_Queue_T.h \ - Default_Dispatcher_Impl.h \ - Default_Dispatcher_Impl.inl \ - Dispatcher_Impl.h \ - Dispatcher_Impl.inl \ - Dispatcher_Task.h \ - Dispatcher_Task.inl \ - Kokyu.h \ - Kokyu.inl \ - Kokyu_defs.h \ - Kokyu_defs.inl \ - Kokyu_dsrt.cpp \ - Kokyu_dsrt.h \ - Kokyu_dsrt.inl - -pkgconfig_DATA = \ - Kokyu.pc - -CLEANFILES = \ - Kokyu.pc - -Kokyu.pc: ${top_builddir}/config.status ${srcdir}/Kokyu.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/Kokyu.pc.in - -EXTRA_DIST = \ - Kokyu.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/Kokyu/README b/ACE/Kokyu/README index 9db0e95225b..cc62363d563 100644 --- a/ACE/Kokyu/README +++ b/ACE/Kokyu/README @@ -1,4 +1,4 @@ -# $Id: +$Id$ Kokyu is a portable middleware scheduling framework designed to provide flexible scheduling and dispatching services within the diff --git a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am deleted file mode 100644 index 4ed16f988cd..00000000000 --- a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.DSRT_MIF.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = MIF - -MIF_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/Kokyu - -MIF_SOURCES = \ - MIF.cpp - -MIF_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/Kokyu/tests/DSRT_MIF/svc.conf.xml b/ACE/Kokyu/tests/DSRT_MIF/svc.conf.xml index aef4b3ea0a9..8bea31b0236 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/svc.conf.xml +++ b/ACE/Kokyu/tests/DSRT_MIF/svc.conf.xml @@ -2,6 +2,8 @@ <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> <!-- --> + <!-- $Id$ --> + <!-- --> <dynamic id="DSRT_Scheduler_Impl" type="Service_Object"> <initializer path="Kokyu" init="_make_MIF_Scheduler_Impl" params="-sched_scope thread -sched_policy fifo -min_importance 0 -max_importance 10"/> </dynamic> diff --git a/ACE/Kokyu/tests/EDF/Makefile.am b/ACE/Kokyu/tests/EDF/Makefile.am deleted file mode 100644 index 9aa8fcdf71d..00000000000 --- a/ACE/Kokyu/tests/EDF/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.EDF.am - -noinst_PROGRAMS = EDF - -EDF_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/Kokyu - -EDF_SOURCES = \ - test.cpp - -EDF_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/Kokyu/tests/EDF/README b/ACE/Kokyu/tests/EDF/README index 4f209605e14..0f99d6a867c 100644 --- a/ACE/Kokyu/tests/EDF/README +++ b/ACE/Kokyu/tests/EDF/README @@ -1,3 +1,5 @@ +$Id$ + This example is a very simple example, showing how to use the Kokyu dispatcher to dispatch command objects in a EDF manner. The test configures the Kokyu dispatcher with a single EDF lane. Typically this @@ -8,7 +10,7 @@ enqueue the command objects and *then* activate the dispatcher. Only when the dispatcher is activated, the thread watching each dispatch queue starts running. -To run this example, +To run this example, ./test -p<fifo|rr|other> diff --git a/ACE/Kokyu/tests/FIFO/Makefile.am b/ACE/Kokyu/tests/FIFO/Makefile.am deleted file mode 100644 index 05b7dbe9e38..00000000000 --- a/ACE/Kokyu/tests/FIFO/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.FIFO.am - -noinst_PROGRAMS = FIFO - -FIFO_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/Kokyu - -FIFO_SOURCES = \ - test.cpp - -FIFO_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/Kokyu/tests/FIFO/README b/ACE/Kokyu/tests/FIFO/README index 5700e4a5038..ec4dcb55858 100644 --- a/ACE/Kokyu/tests/FIFO/README +++ b/ACE/Kokyu/tests/FIFO/README @@ -1,3 +1,5 @@ +$Id$ + This example is a very simple example, showing how to use the Kokyu dispatcher to dispatch command objects in a FIFO manner. The test configures the Kokyu dispatcher with 3 FIFO lanes, each having a @@ -6,9 +8,9 @@ which assigns priorities to tasks based on the rate of tasks. To ensure that the command objects enqueued in the dispatcher are dispatched in the correct order, we enqueue the command objects and *then* activate the dispatcher. Only when the dispatcher is activated, -the thread watching each dispatch queue starts running. +the thread watching each dispatch queue starts running. -To run this example, +To run this example, ./test -p<fifo|rr|other> diff --git a/ACE/Kokyu/tests/Makefile.am b/ACE/Kokyu/tests/Makefile.am deleted file mode 100644 index 9745459d4e3..00000000000 --- a/ACE/Kokyu/tests/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - DSRT_MIF \ - EDF \ - FIFO - @@ -1,6 +1,15 @@ +USER VISIBLE CHANGES BETWEEN ACE-6.0.5 and ACE-6.1.0 +==================================================== + +. Removed autoconf support, only traditional way of + compilation is shipped from now + USER VISIBLE CHANGES BETWEEN ACE-6.0.4 and ACE-6.0.5 ==================================================== +. Improved support for Android and added the ability to run all ACE/TAO tests + automatically using the Android emulator + USER VISIBLE CHANGES BETWEEN ACE-6.0.3 and ACE-6.0.4 ==================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 34c60219c5a..7d75c9a4410 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -40,7 +40,7 @@ To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - ACE VERSION: 6.0.4 + ACE VERSION: 6.0.5 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/README b/ACE/README index 1b46d7fd6f4..4994a94f1f9 100644 --- a/ACE/README +++ b/ACE/README @@ -1,3 +1,5 @@ +$Id$ + This document is also available at the following URL: http://www.cs.wustl.edu/~schmidt/ACE.html diff --git a/ACE/VERSION b/ACE/VERSION index 54346d61e40..2561b9e5c3e 100644 --- a/ACE/VERSION +++ b/ACE/VERSION @@ -1,4 +1,4 @@ -This is ACE version 6.0.4, released Tue Aug 23 19:01:44 CEST 2011 +This is ACE version 6.0.5, released Mon Oct 10 08:48:51 CEST 2011 If you have any problems with or questions about ACE, please send e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu), diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index e2dc68961ab..064a278fa7b 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -563,7 +563,7 @@ public: ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask); - /// Register @a event_handler> with all the @a handles> in the @c + /// Register @a event_handler with all the @a handles in the @c /// Handle_Set. virtual int register_handler (const ACE_Handle_Set &handles, ACE_Event_Handler *event_handler, @@ -815,7 +815,7 @@ public: /// Wake up all threads waiting in the event loop. virtual void wakeup_all_threads (void); - /// Transfers ownership of Reactor_Impl to the new_owner. + /// Transfers ownership of Reactor_Impl to the @a new_owner. /** * @note There is no need to set the owner of the event loop for the * ACE_Dev_Poll_Reactor. Multiple threads may invoke the @@ -828,7 +828,7 @@ public: /** * @note There is no need to set the owner of the event loop for the * ACE_Dev_Poll_Reactor. Multiple threads may invoke the - * event loop simulataneously. As such, this method is a + * event loop simultaneously. As such, this method is a * no-op. */ virtual int owner (ACE_thread_t *owner); @@ -1123,7 +1123,7 @@ protected: /// 2) wait quietly for the token, not waking another thread. This /// is appropriate for cases where a thread wants to wait for and /// dispatch an event, not causing an existing waiter to relinquish the - /// token, and also queueing up behind other threads waiting to modify + /// token, and also queuing up behind other threads waiting to modify /// event records. int acquire_quietly (ACE_Time_Value *max_wait = 0); diff --git a/ACE/ace/ETCL/Makefile.am b/ACE/ace/ETCL/Makefile.am deleted file mode 100644 index 5d1c7afdd42..00000000000 --- a/ACE/ace/ETCL/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace/ETCL -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.ACE_ETCL.am - -lib_LTLIBRARIES = libACE_ETCL.la - -libACE_ETCL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_ETCL_BUILD_DLL - -libACE_ETCL_la_SOURCES = \ - ETCL_Constraint.cpp \ - ETCL_Constraint_Visitor.cpp - -libACE_ETCL_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACE_ETCL_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - ETCL_Constraint.h \ - ETCL_Constraint.inl \ - ETCL_Constraint_Visitor.h \ - ace_etcl_export.h - -pkgconfig_DATA = \ - ACE_ETCL.pc - -CLEANFILES = \ - ACE_ETCL.pc - -ACE_ETCL.pc: ${top_builddir}/config.status ${srcdir}/ACE_ETCL.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_ETCL.pc.in - -EXTRA_DIST = \ - ACE_ETCL.pc.in - - -## Makefile.ACE_ETCL_Parser.am - -lib_LTLIBRARIES += libACE_ETCL_Parser.la - -libACE_ETCL_Parser_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DETCL_PARSER_BUILD_DLL - -libACE_ETCL_Parser_la_SOURCES = \ - ETCL_Interpreter.cpp \ - ETCL_l.cpp \ - ETCL_y.cpp - -libACE_ETCL_Parser_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACE_ETCL_Parser_la_LIBADD = \ - libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - ETCL_Interpreter.h \ - ETCL_y.h \ - etcl_parser_export.h - -pkgconfig_DATA += \ - ACE_ETCL_Parser.pc - -CLEANFILES += \ - ACE_ETCL_Parser.pc - -ACE_ETCL_Parser.pc: ${top_builddir}/config.status ${srcdir}/ACE_ETCL_Parser.pc.in - ${top_builddir}/config.status --file "$@":${srcdir}/ACE_ETCL_Parser.pc.in - -EXTRA_DIST += \ - ACE_ETCL_Parser.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am deleted file mode 100644 index 6961e42953d..00000000000 --- a/ACE/ace/Makefile.am +++ /dev/null @@ -1,1450 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - ETCL \ - Monitor_Control \ - SSL - -CLEANFILES = -lib_LTLIBRARIES = -pkgconfig_DATA = -nobase_include_HEADERS = - -## Makefile.ACE.am - -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES += libACE.la - -libACE_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_DLL - -libACE_la_SOURCES = \ - ACE.cpp \ - ACE_crc32.cpp \ - ACE_crc_ccitt.cpp \ - ATM_Acceptor.cpp \ - ATM_Addr.cpp \ - ATM_Connector.cpp \ - ATM_Params.cpp \ - ATM_QoS.cpp \ - ATM_Stream.cpp \ - Activation_Queue.cpp \ - Active_Map_Manager.cpp \ - Addr.cpp \ - Argv_Type_Converter.cpp \ - Assert.cpp \ - Asynch_IO.cpp \ - Asynch_IO_Impl.cpp \ - Asynch_Pseudo_Task.cpp \ - Atomic_Op.cpp \ - Atomic_Op_Sparc.c \ - Auto_Event.cpp \ - Barrier.cpp \ - Base_Thread_Adapter.cpp \ - Based_Pointer_Repository.cpp \ - Basic_Stats.cpp \ - Basic_Types.cpp \ - CDR_Base.cpp \ - CDR_Size.cpp \ - CDR_Stream.cpp \ - Capabilities.cpp \ - Cleanup.cpp \ - Codecs.cpp \ - Codeset_IBM1047.cpp \ - Codeset_Registry.cpp \ - Codeset_Registry_db.cpp \ - Condition_Recursive_Thread_Mutex.cpp \ - Condition_Thread_Mutex.cpp \ - Configuration.cpp \ - Configuration_Import_Export.cpp \ - Connection_Recycling_Strategy.cpp \ - Containers.cpp \ - Copy_Disabled.cpp \ - Countdown_Time.cpp \ - DEV.cpp \ - DEV_Addr.cpp \ - DEV_Connector.cpp \ - DEV_IO.cpp \ - DLL.cpp \ - DLL_Manager.cpp \ - Date_Time.cpp \ - Dev_Poll_Reactor.cpp \ - Dirent.cpp \ - Dirent_Selector.cpp \ - Dump.cpp \ - Dynamic.cpp \ - Dynamic_Message_Strategy.cpp \ - Dynamic_Service_Base.cpp \ - Dynamic_Service_Dependency.cpp \ - Encoding_Converter.cpp \ - Encoding_Converter_Factory.cpp \ - Event.cpp \ - Event_Handler.cpp \ - FIFO.cpp \ - FIFO_Recv.cpp \ - FIFO_Recv_Msg.cpp \ - FIFO_Send.cpp \ - FIFO_Send_Msg.cpp \ - FILE.cpp \ - FILE_Addr.cpp \ - FILE_Connector.cpp \ - FILE_IO.cpp \ - File_Lock.cpp \ - Filecache.cpp \ - Flag_Manip.cpp \ - Framework_Component.cpp \ - Functor.cpp \ - Functor_String.cpp \ - Get_Opt.cpp \ - Handle_Ops.cpp \ - Handle_Set.cpp \ - Hashable.cpp \ - High_Res_Timer.cpp \ - ICMP_Socket.cpp \ - INET_Addr.cpp \ - IOStream.cpp \ - IO_Cntl_Msg.cpp \ - IO_SAP.cpp \ - IPC_SAP.cpp \ - Init_ACE.cpp \ - LSOCK.cpp \ - LSOCK_Acceptor.cpp \ - LSOCK_CODgram.cpp \ - LSOCK_Connector.cpp \ - LSOCK_Dgram.cpp \ - LSOCK_Stream.cpp \ - Lib_Find.cpp \ - Local_Memory_Pool.cpp \ - Local_Name_Space.cpp \ - Local_Tokens.cpp \ - Lock.cpp \ - Log_Msg.cpp \ - Log_Msg_Backend.cpp \ - Log_Msg_Callback.cpp \ - Log_Msg_IPC.cpp \ - Log_Msg_NT_Event_Log.cpp \ - Log_Msg_UNIX_Syslog.cpp \ - Log_Record.cpp \ - Logging_Strategy.cpp \ - MEM_Acceptor.cpp \ - MEM_Addr.cpp \ - MEM_Connector.cpp \ - MEM_IO.cpp \ - MEM_SAP.cpp \ - MEM_Stream.cpp \ - MMAP_Memory_Pool.cpp \ - Malloc.cpp \ - Malloc_Allocator.cpp \ - Manual_Event.cpp \ - Mem_Map.cpp \ - Message_Block.cpp \ - Message_Queue.cpp \ - Message_Queue_NT.cpp \ - Message_Queue_Vx.cpp \ - Method_Request.cpp \ - Monitor_Admin.cpp \ - Monitor_Admin_Manager.cpp \ - Monitor_Base.cpp \ - Monitor_Control_Action.cpp \ - Monitor_Control_Types.cpp \ - Monitor_Point_Registry.cpp \ - Monitor_Size.cpp \ - Msg_WFMO_Reactor.cpp \ - Multihomed_INET_Addr.cpp \ - Mutex.cpp \ - NT_Service.cpp \ - Name_Proxy.cpp \ - Name_Request_Reply.cpp \ - Name_Space.cpp \ - Naming_Context.cpp \ - Netlink_Addr.cpp \ - Notification_Queue.cpp \ - Notification_Strategy.cpp \ - OS_Errno.cpp \ - OS_Log_Msg_Attributes.cpp \ - OS_NS_Thread.cpp \ - OS_NS_arpa_inet.cpp \ - OS_NS_ctype.cpp \ - OS_NS_dirent.cpp \ - OS_NS_dlfcn.cpp \ - OS_NS_errno.cpp \ - OS_NS_fcntl.cpp \ - OS_NS_math.cpp \ - OS_NS_netdb.cpp \ - OS_NS_poll.cpp \ - OS_NS_pwd.cpp \ - OS_NS_regex.cpp \ - OS_NS_signal.cpp \ - OS_NS_stdio.cpp \ - OS_NS_stdlib.cpp \ - OS_NS_string.cpp \ - OS_NS_strings.cpp \ - OS_NS_stropts.cpp \ - OS_NS_sys_mman.cpp \ - OS_NS_sys_msg.cpp \ - OS_NS_sys_resource.cpp \ - OS_NS_sys_select.cpp \ - OS_NS_sys_sendfile.cpp \ - OS_NS_sys_shm.cpp \ - OS_NS_sys_socket.cpp \ - OS_NS_sys_stat.cpp \ - OS_NS_sys_time.cpp \ - OS_NS_sys_uio.cpp \ - OS_NS_sys_utsname.cpp \ - OS_NS_sys_wait.cpp \ - OS_NS_time.cpp \ - OS_NS_unistd.cpp \ - OS_NS_wchar.cpp \ - OS_NS_wctype.cpp \ - OS_QoS.cpp \ - OS_TLI.cpp \ - OS_Thread_Adapter.cpp \ - OS_main.cpp \ - Obchunk.cpp \ - Object_Manager.cpp \ - Object_Manager_Base.cpp \ - PI_Malloc.cpp \ - POSIX_Asynch_IO.cpp \ - POSIX_CB_Proactor.cpp \ - POSIX_Proactor.cpp \ - Pagefile_Memory_Pool.cpp \ - Parse_Node.cpp \ - Ping_Socket.cpp \ - Pipe.cpp \ - Priority_Reactor.cpp \ - Proactor.cpp \ - Proactor_Impl.cpp \ - Process.cpp \ - Process_Manager.cpp \ - Process_Mutex.cpp \ - Process_Semaphore.cpp \ - Profile_Timer.cpp \ - RW_Mutex.cpp \ - RW_Process_Mutex.cpp \ - RW_Thread_Mutex.cpp \ - Reactor.cpp \ - Reactor_Impl.cpp \ - Reactor_Notification_Strategy.cpp \ - Reactor_Timer_Interface.cpp \ - Read_Buffer.cpp \ - Recursive_Thread_Mutex.cpp \ - Recyclable.cpp \ - Registry.cpp \ - Registry_Name_Space.cpp \ - Remote_Name_Space.cpp \ - Remote_Tokens.cpp \ - Rtems_init.c \ - SOCK.cpp \ - SOCK_Acceptor.cpp \ - SOCK_CODgram.cpp \ - SOCK_Connector.cpp \ - SOCK_Dgram.cpp \ - SOCK_Dgram_Bcast.cpp \ - SOCK_Dgram_Mcast.cpp \ - SOCK_IO.cpp \ - SOCK_Netlink.cpp \ - SOCK_SEQPACK_Acceptor.cpp \ - SOCK_SEQPACK_Association.cpp \ - SOCK_SEQPACK_Connector.cpp \ - SOCK_Stream.cpp \ - SPIPE.cpp \ - SPIPE_Acceptor.cpp \ - SPIPE_Addr.cpp \ - SPIPE_Connector.cpp \ - SPIPE_Stream.cpp \ - SString.cpp \ - Stack_Trace.cpp \ - SUN_Proactor.cpp \ - SV_Message.cpp \ - SV_Message_Queue.cpp \ - SV_Semaphore_Complex.cpp \ - SV_Semaphore_Simple.cpp \ - SV_Shared_Memory.cpp \ - Sample_History.cpp \ - Sbrk_Memory_Pool.cpp \ - Sched_Params.cpp \ - Select_Reactor_Base.cpp \ - Semaphore.cpp \ - Service_Config.cpp \ - Service_Gestalt.cpp \ - Service_Manager.cpp \ - Service_Object.cpp \ - Service_Repository.cpp \ - Service_Types.cpp \ - Shared_Memory.cpp \ - Shared_Memory_MM.cpp \ - Shared_Memory_Pool.cpp \ - Shared_Memory_SV.cpp \ - Shared_Object.cpp \ - Sig_Adapter.cpp \ - Sig_Handler.cpp \ - Signal.cpp \ - Sock_Connect.cpp \ - Stats.cpp \ - String_Base_Const.cpp \ - Svc_Conf_Lexer.cpp \ - Svc_Conf_y.cpp \ - Synch_Options.cpp \ - System_Time.cpp \ - TLI.cpp \ - TLI_Acceptor.cpp \ - TLI_Connector.cpp \ - TLI_Stream.cpp \ - TP_Reactor.cpp \ - TSS_Adapter.cpp \ - TTY_IO.cpp \ - Task.cpp \ - Thread.cpp \ - Thread_Adapter.cpp \ - Thread_Control.cpp \ - Thread_Exit.cpp \ - Thread_Hook.cpp \ - Thread_Manager.cpp \ - Thread_Mutex.cpp \ - Thread_Semaphore.cpp \ - Throughput_Stats.cpp \ - Time_Value.cpp \ - Timeprobe.cpp \ - Token.cpp \ - Token_Collection.cpp \ - Token_Invariants.cpp \ - Token_Manager.cpp \ - Token_Request_Reply.cpp \ - Trace.cpp \ - UNIX_Addr.cpp \ - UPIPE_Acceptor.cpp \ - UPIPE_Connector.cpp \ - UPIPE_Stream.cpp \ - UTF16_Encoding_Converter.cpp \ - UTF32_Encoding_Converter.cpp \ - UTF8_Encoding_Converter.cpp \ - UUID.cpp \ - WFMO_Reactor.cpp \ - WIN32_Asynch_IO.cpp \ - WIN32_Proactor.cpp \ - XML_Svc_Conf.cpp \ - XTI_ATM_Mcast.cpp \ - ace_wchar.cpp - -libACE_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -nobase_include_HEADERS += \ - ACE.h \ - ACE.inl \ - ACE_export.h \ - ARGV.cpp \ - ARGV.h \ - ARGV.inl \ - ATM_Acceptor.h \ - ATM_Acceptor.inl \ - ATM_Addr.h \ - ATM_Addr.inl \ - ATM_Connector.h \ - ATM_Connector.inl \ - ATM_Params.h \ - ATM_Params.inl \ - ATM_QoS.h \ - ATM_QoS.inl \ - ATM_Stream.h \ - ATM_Stream.inl \ - Acceptor.cpp \ - Acceptor.h \ - Activation_Queue.h \ - Activation_Queue.inl \ - Active_Map_Manager.h \ - Active_Map_Manager.inl \ - Active_Map_Manager_T.cpp \ - Active_Map_Manager_T.h \ - Active_Map_Manager_T.inl \ - Addr.h \ - Addr.inl \ - Arg_Shifter.cpp \ - Arg_Shifter.h \ - Argv_Type_Converter.h \ - Argv_Type_Converter.inl \ - Array_Base.cpp \ - Array_Base.h \ - Array_Base.inl \ - Array_Map.cpp \ - Array_Map.h \ - Array_Map.inl \ - Assert.h \ - Asynch_Acceptor.cpp \ - Asynch_Acceptor.h \ - Asynch_Connector.cpp \ - Asynch_Connector.h \ - Asynch_IO.h \ - Asynch_IO_Impl.h \ - Asynch_IO_Impl.inl \ - Asynch_Pseudo_Task.h \ - Atomic_Op.h \ - Atomic_Op.inl \ - Atomic_Op_Sparc.h \ - Atomic_Op_T.cpp \ - Atomic_Op_GCC_T.h \ - Atomic_Op_GCC_T.cpp \ - Atomic_Op_GCC_T.inl \ - Atomic_Op_T.h \ - Atomic_Op_T.inl \ - Auto_Event.h \ - Auto_Event.inl \ - Auto_Functor.cpp \ - Auto_Functor.h \ - Auto_Functor.inl \ - Auto_IncDec_T.cpp \ - Auto_IncDec_T.h \ - Auto_IncDec_T.inl \ - Auto_Ptr.cpp \ - Auto_Ptr.h \ - Auto_Ptr.inl \ - Barrier.h \ - Barrier.inl \ - Base_Thread_Adapter.h \ - Base_Thread_Adapter.inl \ - Based_Pointer_Repository.h \ - Based_Pointer_T.cpp \ - Based_Pointer_T.h \ - Based_Pointer_T.inl \ - Basic_Stats.h \ - Basic_Stats.inl \ - Basic_Types.h \ - Basic_Types.inl \ - Bound_Ptr.h \ - Bound_Ptr.inl \ - CDR_Base.h \ - CDR_Base.inl \ - CDR_Size.h \ - CDR_Size.inl \ - CDR_Stream.h \ - CDR_Stream.inl \ - CORBA_macros.h \ - Cache_Map_Manager_T.cpp \ - Cache_Map_Manager_T.h \ - Cache_Map_Manager_T.inl \ - Cached_Connect_Strategy_T.cpp \ - Cached_Connect_Strategy_T.h \ - Caching_Strategies_T.cpp \ - Caching_Strategies_T.h \ - Caching_Strategies_T.inl \ - Caching_Utility_T.cpp \ - Caching_Utility_T.h \ - Capabilities.h \ - Capabilities.inl \ - Cleanup.h \ - Cleanup.inl \ - Cleanup_Strategies_T.cpp \ - Cleanup_Strategies_T.h \ - Codecs.h \ - Codeset_IBM1047.h \ - Codeset_Registry.h \ - Codeset_Registry.inl \ - Condition_Recursive_Thread_Mutex.h \ - Condition_T.cpp \ - Condition_T.h \ - Condition_T.inl \ - Condition_Thread_Mutex.h \ - Condition_Thread_Mutex.inl \ - Configuration.h \ - Configuration.inl \ - Configuration_Import_Export.h \ - Connection_Recycling_Strategy.h \ - Connector.cpp \ - Connector.h \ - Containers.h \ - Containers.inl \ - Containers_T.cpp \ - Containers_T.h \ - Containers_T.inl \ - Copy_Disabled.h \ - Countdown_Time.h \ - Countdown_Time.inl \ - DEV.h \ - DEV.inl \ - DEV_Addr.h \ - DEV_Addr.inl \ - DEV_Connector.h \ - DEV_Connector.inl \ - DEV_IO.h \ - DEV_IO.inl \ - DLL.h \ - DLL_Manager.h \ - Date_Time.h \ - Date_Time.inl \ - Default_Constants.h \ - Dev_Poll_Reactor.h \ - Dev_Poll_Reactor.inl \ - Dirent.h \ - Dirent.inl \ - Dirent_Selector.h \ - Dirent_Selector.inl \ - Dump.h \ - Dump_T.cpp \ - Dump_T.h \ - Dynamic.h \ - Dynamic.inl \ - Dynamic_Message_Strategy.h \ - Dynamic_Message_Strategy.inl \ - Dynamic_Service.cpp \ - Dynamic_Service.h \ - Dynamic_Service.inl \ - Dynamic_Service_Base.h \ - Dynamic_Service_Dependency.h \ - Encoding_Converter.h \ - Encoding_Converter_Factory.h \ - Env_Value_T.cpp \ - Env_Value_T.h \ - Env_Value_T.inl \ - Event.h \ - Event.inl \ - Event_Handler.h \ - Event_Handler.inl \ - Event_Handler_T.cpp \ - Event_Handler_T.h \ - Event_Handler_T.inl \ - FIFO.h \ - FIFO.inl \ - FIFO_Recv.h \ - FIFO_Recv.inl \ - FIFO_Recv_Msg.h \ - FIFO_Recv_Msg.inl \ - FIFO_Send.h \ - FIFO_Send.inl \ - FIFO_Send_Msg.h \ - FIFO_Send_Msg.inl \ - FILE.h \ - FILE.inl \ - FILE_Addr.h \ - FILE_Addr.inl \ - FILE_Connector.h \ - FILE_Connector.inl \ - FILE_IO.h \ - FILE_IO.inl \ - File_Lock.h \ - File_Lock.inl \ - Filecache.h \ - Flag_Manip.h \ - Flag_Manip.inl \ - Framework_Component.h \ - Framework_Component.inl \ - Framework_Component_T.cpp \ - Framework_Component_T.h \ - Free_List.cpp \ - Free_List.h \ - Functor.h \ - Functor.inl \ - Functor_String.h \ - Functor_String.inl \ - Functor_T.cpp \ - Functor_T.h \ - Functor_T.inl \ - Future.cpp \ - Future.h \ - Future_Set.cpp \ - Future_Set.h \ - Get_Opt.h \ - Get_Opt.inl \ - Global_Macros.h \ - Guard_T.cpp \ - Guard_T.h \ - Guard_T.inl \ - Handle_Gobbler.h \ - Handle_Gobbler.inl \ - Handle_Ops.h \ - Handle_Set.h \ - Handle_Set.inl \ - Hash_Cache_Map_Manager_T.cpp \ - Hash_Cache_Map_Manager_T.h \ - Hash_Cache_Map_Manager_T.inl \ - Hash_Map_Manager.h \ - Hash_Map_Manager_T.cpp \ - Hash_Map_Manager_T.h \ - Hash_Map_Manager_T.inl \ - Hash_Map_With_Allocator_T.cpp \ - Hash_Map_With_Allocator_T.h \ - Hash_Map_With_Allocator_T.inl \ - Hash_Multi_Map_Manager_T.cpp \ - Hash_Multi_Map_Manager_T.h \ - Hash_Multi_Map_Manager_T.inl \ - Hashable.h \ - Hashable.inl \ - High_Res_Timer.h \ - High_Res_Timer.inl \ - ICMP_Socket.h \ - INET_Addr.h \ - INET_Addr.inl \ - IOStream.h \ - IOStream_T.cpp \ - IOStream_T.h \ - IOStream_T.inl \ - IO_Cntl_Msg.h \ - IO_Cntl_Msg.inl \ - IO_SAP.h \ - IO_SAP.inl \ - IPC_SAP.h \ - IPC_SAP.inl \ - If_Then_Else.h \ - Init_ACE.h \ - Intrusive_Auto_Ptr.cpp \ - Intrusive_Auto_Ptr.h \ - Intrusive_Auto_Ptr.inl \ - Intrusive_List.cpp \ - Intrusive_List.h \ - Intrusive_List.inl \ - Intrusive_List_Node.cpp \ - Intrusive_List_Node.h \ - Intrusive_List_Node.inl \ - LOCK_SOCK_Acceptor.cpp \ - LOCK_SOCK_Acceptor.h \ - LSOCK.h \ - LSOCK.inl \ - LSOCK_Acceptor.h \ - LSOCK_CODgram.h \ - LSOCK_CODgram.inl \ - LSOCK_Connector.h \ - LSOCK_Connector.inl \ - LSOCK_Dgram.h \ - LSOCK_Dgram.inl \ - LSOCK_Stream.h \ - LSOCK_Stream.inl \ - Lib_Find.h \ - Local_Memory_Pool.h \ - Local_Name_Space.h \ - Local_Name_Space_T.cpp \ - Local_Name_Space_T.h \ - Local_Tokens.h \ - Local_Tokens.inl \ - Lock.h \ - Lock.inl \ - Lock_Adapter_T.cpp \ - Lock_Adapter_T.h \ - Lock_Adapter_T.inl \ - Log_Msg.h \ - Log_Msg.inl \ - Log_Msg_Backend.h \ - Log_Msg_Callback.h \ - Log_Msg_IPC.h \ - Log_Msg_NT_Event_Log.h \ - Log_Msg_UNIX_Syslog.h \ - Log_Priority.h \ - Log_Record.h \ - Log_Record.inl \ - Logging_Strategy.h \ - MEM_Acceptor.h \ - MEM_Acceptor.inl \ - MEM_Addr.h \ - MEM_Addr.inl \ - MEM_Connector.h \ - MEM_Connector.inl \ - MEM_IO.h \ - MEM_IO.inl \ - MEM_SAP.h \ - MEM_SAP.inl \ - MEM_Stream.h \ - MEM_Stream.inl \ - MMAP_Memory_Pool.h \ - MMAP_Memory_Pool.inl \ - Malloc.h \ - Malloc.inl \ - Malloc_Allocator.h \ - Malloc_Allocator.inl \ - Malloc_Base.h \ - Malloc_T.cpp \ - Malloc_T.h \ - Malloc_T.inl \ - Managed_Object.cpp \ - Managed_Object.h \ - Managed_Object.inl \ - Manual_Event.h \ - Manual_Event.inl \ - Map_Manager.cpp \ - Map_Manager.h \ - Map_Manager.inl \ - Map_T.cpp \ - Map_T.h \ - Map_T.inl \ - Mem_Map.h \ - Mem_Map.inl \ - Memory_Pool.h \ - Message_Block.h \ - Message_Block.inl \ - Message_Block_T.cpp \ - Message_Block_T.h \ - Message_Block_T.inl \ - Message_Queue.h \ - Message_Queue.inl \ - Message_Queue_NT.h \ - Message_Queue_NT.inl \ - Message_Queue_T.cpp \ - Message_Queue_T.h \ - Message_Queue_Vx.h \ - Message_Queue_Vx.inl \ - Method_Request.h \ - Min_Max.h \ - Module.cpp \ - Module.h \ - Module.inl \ - Monitor_Admin.h \ - Monitor_Admin_Manager.h \ - Monitor_Base.h \ - Monitor_Base.inl \ - Monitor_Control_Action.h \ - Monitor_Control_Types.h \ - Monitor_Point_Registry.h \ - Monitor_Size.h \ - Msg_WFMO_Reactor.h \ - Msg_WFMO_Reactor.inl \ - Multihomed_INET_Addr.h \ - Multihomed_INET_Addr.inl \ - Mutex.h \ - Mutex.inl \ - NT_Service.h \ - NT_Service.inl \ - Name_Proxy.h \ - Name_Request_Reply.h \ - Name_Space.h \ - Naming_Context.h \ - Naming_Context.inl \ - Netlink_Addr.h \ - Netlink_Addr.inl \ - Node.cpp \ - Node.h \ - Notification_Queue.h \ - Notification_Queue.inl \ - Notification_Strategy.h \ - Notification_Strategy.inl \ - Null_Barrier.h \ - Null_Condition.h \ - Null_Mutex.h \ - Null_Semaphore.h \ - Numeric_Limits.h \ - Obstack.h \ - OS_Errno.h \ - OS_Errno.inl \ - OS_Log_Msg_Attributes.h \ - OS_Log_Msg_Attributes.inl \ - OS_Memory.h \ - OS_NS_Thread.h \ - OS_NS_Thread.inl \ - OS_NS_arpa_inet.h \ - OS_NS_arpa_inet.inl \ - OS_NS_ctype.h \ - OS_NS_ctype.inl \ - OS_NS_dirent.h \ - OS_NS_dirent.inl \ - OS_NS_dlfcn.h \ - OS_NS_dlfcn.inl \ - OS_NS_errno.h \ - OS_NS_errno.inl \ - OS_NS_fcntl.h \ - OS_NS_fcntl.inl \ - OS_NS_macros.h \ - OS_NS_math.h \ - OS_NS_math.inl \ - OS_NS_netdb.h \ - OS_NS_netdb.inl \ - OS_NS_poll.h \ - OS_NS_poll.inl \ - OS_NS_pwd.h \ - OS_NS_pwd.inl \ - OS_NS_regex.h \ - OS_NS_regex.inl \ - OS_NS_signal.h \ - OS_NS_signal.inl \ - OS_NS_stdio.h \ - OS_NS_stdio.inl \ - OS_NS_stdlib.h \ - OS_NS_stdlib.inl \ - OS_NS_string.h \ - OS_NS_string.inl \ - OS_NS_strings.h \ - OS_NS_strings.inl \ - OS_NS_stropts.h \ - OS_NS_stropts.inl \ - OS_NS_sys_mman.h \ - OS_NS_sys_mman.inl \ - OS_NS_sys_msg.h \ - OS_NS_sys_msg.inl \ - OS_NS_sys_resource.h \ - OS_NS_sys_resource.inl \ - OS_NS_sys_select.h \ - OS_NS_sys_select.inl \ - OS_NS_sys_sendfile.h \ - OS_NS_sys_sendfile.inl \ - OS_NS_sys_shm.h \ - OS_NS_sys_shm.inl \ - OS_NS_sys_socket.h \ - OS_NS_sys_socket.inl \ - OS_NS_sys_stat.h \ - OS_NS_sys_stat.inl \ - OS_NS_sys_time.h \ - OS_NS_sys_time.inl \ - OS_NS_sys_uio.h \ - OS_NS_sys_uio.inl \ - OS_NS_sys_utsname.h \ - OS_NS_sys_wait.h \ - OS_NS_sys_wait.inl \ - OS_NS_time.h \ - OS_NS_time.inl \ - OS_NS_unistd.h \ - OS_NS_unistd.inl \ - OS_NS_wchar.h \ - OS_NS_wctype.h \ - OS_NS_wctype.inl \ - OS_NS_wchar.inl \ - OS_QoS.h \ - OS_TLI.h \ - OS_TLI.inl \ - OS_Thread_Adapter.h \ - OS_main.h \ - Obchunk.h \ - Obchunk.inl \ - Object_Manager.h \ - Object_Manager.inl \ - Object_Manager_Base.h \ - Obstack_T.cpp \ - Obstack_T.h \ - Obstack_T.inl \ - PI_Malloc.h \ - PI_Malloc.inl \ - POSIX_Asynch_IO.h \ - POSIX_CB_Proactor.h \ - POSIX_Proactor.h \ - POSIX_Proactor.inl \ - Pagefile_Memory_Pool.h \ - Pagefile_Memory_Pool.inl \ - Pair_T.cpp \ - Pair_T.h \ - Pair_T.inl \ - Parse_Node.h \ - Ping_Socket.h \ - Ping_Socket.inl \ - Pipe.h \ - Pipe.inl \ - Priority_Reactor.h \ - Proactor.h \ - Proactor.inl \ - Proactor_Impl.h \ - Process.h \ - Process.inl \ - Process_Manager.h \ - Process_Manager.inl \ - Process_Mutex.h \ - Process_Mutex.inl \ - Process_Semaphore.h \ - Process_Semaphore.inl \ - Profile_Timer.h \ - Profile_Timer.inl \ - RB_Tree.cpp \ - RB_Tree.h \ - RB_Tree.inl \ - RW_Mutex.h \ - RW_Mutex.inl \ - RW_Process_Mutex.h \ - RW_Process_Mutex.inl \ - RW_Thread_Mutex.h \ - RW_Thread_Mutex.inl \ - Reactor.h \ - Reactor.inl \ - Reactor_Impl.h \ - Reactor_Notification_Strategy.h \ - Reactor_Notification_Strategy.inl \ - Reactor_Timer_Interface.h \ - Reactor_Token_T.cpp \ - Reactor_Token_T.h \ - Read_Buffer.h \ - Read_Buffer.inl \ - Recursive_Thread_Mutex.h \ - Recursive_Thread_Mutex.inl \ - Recyclable.h \ - Recyclable.inl \ - Refcountable_T.cpp \ - Refcountable_T.h \ - Refcountable_T.inl \ - Refcounted_Auto_Ptr.cpp \ - Refcounted_Auto_Ptr.h \ - Refcounted_Auto_Ptr.inl \ - Registry.h \ - Registry_Name_Space.h \ - Remote_Name_Space.h \ - Remote_Tokens.h \ - Remote_Tokens.inl \ - Reverse_Lock_T.cpp \ - Reverse_Lock_T.h \ - Reverse_Lock_T.inl \ - SOCK.h \ - SOCK.inl \ - SOCK_Acceptor.h \ - SOCK_Acceptor.inl \ - SOCK_CODgram.h \ - SOCK_CODgram.inl \ - SOCK_Connector.h \ - SOCK_Connector.inl \ - SOCK_Dgram.h \ - SOCK_Dgram.inl \ - SOCK_Dgram_Bcast.h \ - SOCK_Dgram_Bcast.inl \ - SOCK_Dgram_Mcast.h \ - SOCK_Dgram_Mcast.inl \ - SOCK_IO.h \ - SOCK_IO.inl \ - SOCK_Netlink.h \ - SOCK_Netlink.inl \ - SOCK_SEQPACK_Acceptor.h \ - SOCK_SEQPACK_Acceptor.inl \ - SOCK_SEQPACK_Association.h \ - SOCK_SEQPACK_Association.inl \ - SOCK_SEQPACK_Connector.h \ - SOCK_SEQPACK_Connector.inl \ - SOCK_Stream.h \ - SOCK_Stream.inl \ - SPIPE.h \ - SPIPE.inl \ - SPIPE_Acceptor.h \ - SPIPE_Addr.h \ - SPIPE_Addr.inl \ - SPIPE_Connector.h \ - SPIPE_Connector.inl \ - SPIPE_Stream.h \ - SPIPE_Stream.inl \ - SString.h \ - SString.inl \ - SStringfwd.h \ - Stack_Trace.h \ - SUN_Proactor.h \ - SV_Message.h \ - SV_Message.inl \ - SV_Message_Queue.h \ - SV_Message_Queue.inl \ - SV_Semaphore_Complex.h \ - SV_Semaphore_Complex.inl \ - SV_Semaphore_Simple.h \ - SV_Semaphore_Simple.inl \ - SV_Shared_Memory.h \ - SV_Shared_Memory.inl \ - Sample_History.h \ - Sample_History.inl \ - Sbrk_Memory_Pool.h \ - Sched_Params.h \ - Sched_Params.inl \ - Select_Reactor.h \ - Select_Reactor_Base.h \ - Select_Reactor_Base.inl \ - Select_Reactor_T.cpp \ - Select_Reactor_T.h \ - Select_Reactor_T.inl \ - Semaphore.h \ - Semaphore.inl \ - Service_Config.h \ - Service_Config.inl \ - Service_Gestalt.h \ - Service_Gestalt.inl \ - Service_Manager.h \ - Service_Object.h \ - Service_Object.inl \ - Service_Repository.h \ - Service_Repository.inl \ - Service_Types.h \ - Service_Types.inl \ - Shared_Memory.h \ - Shared_Memory_MM.h \ - Shared_Memory_MM.inl \ - Shared_Memory_Pool.h \ - Shared_Memory_SV.h \ - Shared_Memory_SV.inl \ - Shared_Object.h \ - Shared_Object.inl \ - Sig_Adapter.h \ - Sig_Handler.h \ - Sig_Handler.inl \ - Signal.h \ - Signal.inl \ - Singleton.cpp \ - Singleton.h \ - Singleton.inl \ - Sock_Connect.h \ - Static_Object_Lock.h \ - Stats.h \ - Stats.inl \ - Strategies_T.cpp \ - Strategies_T.h \ - Strategies_T.inl \ - Stream.cpp \ - Stream.h \ - Stream.inl \ - Stream_Modules.cpp \ - Stream_Modules.h \ - String_Base.cpp \ - String_Base.h \ - String_Base.inl \ - String_Base_Const.h \ - Svc_Conf.h \ - Svc_Conf_Lexer.h \ - Svc_Conf_Tokens.h \ - Svc_Conf_Token_Table.h \ - Svc_Handler.cpp \ - Svc_Handler.h \ - Synch.h \ - Synch_Options.h \ - Synch_Traits.h \ - System_Time.h \ - TLI.h \ - TLI.inl \ - TLI_Acceptor.h \ - TLI_Connector.h \ - TLI_Connector.inl \ - TLI_Stream.h \ - TLI_Stream.inl \ - TP_Reactor.h \ - TP_Reactor.inl \ - TSS_Adapter.h \ - TSS_T.cpp \ - TSS_T.h \ - TSS_T.inl \ - TTY_IO.h \ - Task.h \ - Task.inl \ - Task_Ex_T.cpp \ - Task_Ex_T.h \ - Task_Ex_T.inl \ - Task_T.cpp \ - Task_T.h \ - Task_T.inl \ - Test_and_Set.cpp \ - Test_and_Set.h \ - Thread.h \ - Thread.inl \ - Thread_Adapter.h \ - Thread_Adapter.inl \ - Thread_Control.h \ - Thread_Control.inl \ - Thread_Exit.h \ - Thread_Hook.h \ - Thread_Manager.h \ - Thread_Manager.inl \ - Thread_Mutex.h \ - Thread_Mutex.inl \ - Thread_Semaphore.h \ - Thread_Semaphore.inl \ - Throughput_Stats.h \ - Time_Value.h \ - Time_Value.inl \ - Timeprobe.h \ - Timeprobe.inl \ - Timeprobe_T.cpp \ - Timeprobe_T.h \ - Timer_Hash_T.cpp \ - Timer_Hash_T.h \ - Timer_Heap_T.cpp \ - Timer_Heap_T.h \ - Timer_List_T.cpp \ - Timer_List_T.h \ - Timer_Queue_Adapters.cpp \ - Timer_Queue_Adapters.h \ - Timer_Queue_Adapters.inl \ - Timer_Queue_T.cpp \ - Timer_Queue_T.h \ - Timer_Queue_T.inl \ - Timer_Wheel_T.cpp \ - Timer_Wheel_T.h \ - Tokenizer_T.cpp \ - Tokenizer_T.h \ - Timer_Hash.h \ - Timer_Heap.h \ - Timer_List.h \ - Timer_Queue.h \ - Timer_Queuefwd.h \ - Timer_Wheel.h \ - Token.h \ - Token.inl \ - Token_Collection.h \ - Token_Collection.inl \ - Token_Invariants.h \ - Token_Manager.h \ - Token_Manager.inl \ - Token_Request_Reply.h \ - Token_Request_Reply.inl \ - Trace.h \ - Truncate.h \ - Typed_SV_Message.cpp \ - Typed_SV_Message.h \ - Typed_SV_Message.inl \ - Typed_SV_Message_Queue.cpp \ - Typed_SV_Message_Queue.h \ - Typed_SV_Message_Queue.inl \ - UNIX_Addr.h \ - UNIX_Addr.inl \ - UPIPE_Acceptor.h \ - UPIPE_Acceptor.inl \ - UPIPE_Addr.h \ - UPIPE_Connector.h \ - UPIPE_Connector.inl \ - UPIPE_Stream.h \ - UPIPE_Stream.inl \ - UTF16_Encoding_Converter.h \ - UTF16_Encoding_Converter.inl \ - UTF32_Encoding_Converter.h \ - UTF8_Encoding_Converter.h \ - UUID.h \ - UUID.inl \ - Unbounded_Queue.cpp \ - Unbounded_Queue.h \ - Unbounded_Queue.inl \ - Unbounded_Set.cpp \ - Unbounded_Set.h \ - Unbounded_Set.inl \ - Unbounded_Set_Ex.cpp \ - Unbounded_Set_Ex.h \ - Unbounded_Set_Ex.inl \ - Value_Ptr.h \ - Vector_T.cpp \ - Vector_T.h \ - Vector_T.inl \ - Version.h \ - Versioned_Namespace.h \ - WFMO_Reactor.h \ - WFMO_Reactor.inl \ - WIN32_Asynch_IO.h \ - WIN32_Proactor.h \ - XML_Svc_Conf.h \ - XTI_ATM_Mcast.h \ - XTI_ATM_Mcast.inl \ - ace_wchar.h \ - ace_wchar.inl \ - checked_iterator.h \ - config-WinCE.h \ - config-all.h \ - config-lite.h \ - config-macros.h \ - config-win32-borland.h \ - config-win32-common.h \ - config-win32-msvc-7.h \ - config-win32-msvc-8.h \ - config-win32-msvc.h \ - config-win32.h \ - config.h \ - iosfwd.h \ - os_include/arpa/os_inet.h \ - os_include/net/os_if.h \ - os_include/netinet/os_in.h \ - os_include/netinet/os_tcp.h \ - os_include/os_aio.h \ - os_include/os_assert.h \ - os_include/os_byteswap.h \ - os_include/os_complex.h \ - os_include/os_cpio.h \ - os_include/os_ctype.h \ - os_include/os_dirent.h \ - os_include/os_dlfcn.h \ - os_include/os_errno.h \ - os_include/os_fcntl.h \ - os_include/os_fenv.h \ - os_include/os_float.h \ - os_include/os_fmtmsg.h \ - os_include/os_fnmatch.h \ - os_include/os_ftw.h \ - os_include/os_glob.h \ - os_include/os_grp.h \ - os_include/os_iconv.h \ - os_include/os_intrin.h \ - os_include/os_inttypes.h \ - os_include/os_iso646.h \ - os_include/os_kstat.h \ - os_include/os_langinfo.h \ - os_include/os_libgen.h \ - os_include/os_limits.h \ - os_include/os_local.h \ - os_include/os_math.h \ - os_include/os_monetary.h \ - os_include/os_mqueue.h \ - os_include/os_ndbm.h \ - os_include/os_netdb.h \ - os_include/os_nl_types.h \ - os_include/os_pdh.h \ - os_include/os_pdhmsg.h \ - os_include/os_poll.h \ - os_include/os_pthread.h \ - os_include/os_pwd.h \ - os_include/os_regex.h \ - os_include/os_sched.h \ - os_include/os_search.h \ - os_include/os_semaphore.h \ - os_include/os_setjmp.h \ - os_include/os_signal.h \ - os_include/os_spawn.h \ - os_include/os_stdarg.h \ - os_include/os_stdbool.h \ - os_include/os_stddef.h \ - os_include/os_stdint.h \ - os_include/os_stdio.h \ - os_include/os_stdlib.h \ - os_include/os_string.h \ - os_include/os_strings.h \ - os_include/os_stropts.h \ - os_include/os_syslog.h \ - os_include/os_tar.h \ - os_include/os_termios.h \ - os_include/os_tgmath.h \ - os_include/os_time.h \ - os_include/os_trace.h \ - os_include/os_typeinfo.h \ - os_include/os_ucontext.h \ - os_include/os_ulimit.h \ - os_include/os_unistd.h \ - os_include/os_utime.h \ - os_include/os_utmpx.h \ - os_include/os_wchar.h \ - os_include/os_wctype.h \ - os_include/os_wordexp.h \ - os_include/sys/os_ipc.h \ - os_include/sys/os_loadavg.h \ - os_include/sys/os_mman.h \ - os_include/sys/os_msg.h \ - os_include/sys/os_pstat.h \ - os_include/sys/os_resource.h \ - os_include/sys/os_select.h \ - os_include/sys/os_sem.h \ - os_include/sys/os_shm.h \ - os_include/sys/os_socket.h \ - os_include/sys/os_stat.h \ - os_include/sys/os_statvfs.h \ - os_include/sys/os_sysctl.h \ - os_include/sys/os_sysinfo.h \ - os_include/sys/os_time.h \ - os_include/sys/os_timeb.h \ - os_include/sys/os_times.h \ - os_include/sys/os_types.h \ - os_include/sys/os_uio.h \ - os_include/sys/os_un.h \ - os_include/sys/os_utsname.h \ - os_include/sys/os_wait.h \ - post.h \ - pre.h \ - streams.h \ - svc_export.h - -pkgconfig_DATA += \ - ACE.pc - -CLEANFILES += \ - ACE.pc - -ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in - -endif !BUILD_ACE_FOR_TAO - -EXTRA_DIST = \ - ACE.pc.in \ - ace.rc - - -## Makefile.ACE_FlReactor.am - -if BUILD_FL -if BUILD_GL -if BUILD_X11 - -lib_LTLIBRARIES += libACE_FlReactor.la - -libACE_FlReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) \ - -DACE_FLREACTOR_BUILD_DLL - -libACE_FlReactor_la_SOURCES = \ - FlReactor/FlReactor.cpp - -libACE_FlReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_FLTK_LDFLAGS) - -libACE_FlReactor_la_LIBADD = \ - libACE.la \ - $(ACE_FLTK_LIBS) - -nobase_include_HEADERS += \ - FlReactor/ACE_FlReactor_export.h \ - FlReactor/FlReactor.h - -pkgconfig_DATA += \ - ACE_FlReactor.pc - -CLEANFILES += \ - ACE_FlReactor.pc - -ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/FlReactor/ACE_FlReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/FlReactor/ACE_FlReactor.pc.in - -endif BUILD_X11 -endif BUILD_GL -endif BUILD_FL - -EXTRA_DIST += \ - FlReactor/ACE_FlReactor.pc.in - - -## Makefile.ACE_QtReactor.am - -if BUILD_QT - -BUILT_SOURCES = \ - QtReactor/QtReactor_moc.cpp - -CLEANFILES += \ - QtReactor/QtReactor_moc.cpp - -QtReactor/QtReactor_moc.cpp: $(srcdir)/QtReactor/QtReactor.h - $(QTDIR)/bin/moc $(srcdir)/QtReactor/QtReactor.h -o QtReactor/QtReactor_moc.cpp - -lib_LTLIBRARIES += libACE_QtReactor.la - -libACE_QtReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) \ - -DACE_QTREACTOR_BUILD_DLL - -libACE_QtReactor_la_SOURCES = \ - QtReactor/QtReactor.cpp \ - QtReactor/QtReactor_moc.cpp - -libACE_QtReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_QT_LDFLAGS) - -libACE_QtReactor_la_LIBADD = \ - libACE.la \ - $(ACE_QT_LIBS) - -nobase_include_HEADERS += \ - QtReactor/ACE_QtReactor_export.h \ - QtReactor/QtReactor.h - -pkgconfig_DATA += \ - ACE_QtReactor.pc - -CLEANFILES += \ - ACE_QtReactor.pc - -ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/QtReactor/ACE_QtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/QtReactor/ACE_QtReactor.pc.in - -endif BUILD_QT - -EXTRA_DIST += \ - QtReactor/ACE_QtReactor.pc.in - - -## Makefile.ACE_TkReactor.am - -if BUILD_TK - -lib_LTLIBRARIES += libACE_TkReactor.la - -libACE_TkReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_TK_CPPFLAGS) \ - $(ACE_TCL_CPPFLAGS) \ - -DACE_TKREACTOR_BUILD_DLL - -libACE_TkReactor_la_SOURCES = \ - TkReactor/TkReactor.cpp - -libACE_TkReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) - -libACE_TkReactor_la_LIBADD = \ - libACE.la \ - $(ACE_TK_LIBS) \ - $(ACE_TCL_LIBS) - -nobase_include_HEADERS += \ - TkReactor/ACE_TkReactor_export.h \ - TkReactor/TkReactor.h - -pkgconfig_DATA += \ - ACE_TkReactor.pc - -CLEANFILES += \ - ACE_TkReactor.pc - -ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/TkReactor/ACE_TkReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TkReactor/ACE_TkReactor.pc.in - -endif BUILD_TK - -EXTRA_DIST += \ - TkReactor/ACE_TkReactor.pc.in - - -## Makefile.ACE_XtReactor.am - -if BUILD_X11 -if BUILD_XT - -lib_LTLIBRARIES += libACE_XtReactor.la - -libACE_XtReactor_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) \ - -DACE_XTREACTOR_BUILD_DLL - -libACE_XtReactor_la_SOURCES = \ - XtReactor/XtReactor.cpp - -libACE_XtReactor_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -libACE_XtReactor_la_LIBADD = \ - libACE.la \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -nobase_include_HEADERS += \ - XtReactor/ACE_XtReactor_export.h \ - XtReactor/XtReactor.h - -pkgconfig_DATA += \ - ACE_XtReactor.pc - -CLEANFILES += \ - ACE_XtReactor.pc - -ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/XtReactor/ACE_XtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/XtReactor/ACE_XtReactor.pc.in - -endif BUILD_XT -endif BUILD_X11 - -EXTRA_DIST += \ - XtReactor/ACE_XtReactor.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ace/Monitor_Control/Makefile.am b/ACE/ace/Monitor_Control/Makefile.am deleted file mode 100644 index 213cfa8246a..00000000000 --- a/ACE/ace/Monitor_Control/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace/Monitor_Control - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Monitor_Control.am - -if !BUILD_WINCE - -lib_LTLIBRARIES = libACE_Monitor_Control.la - -libACE_Monitor_Control_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DMONITOR_CONTROL_BUILD_DLL - -libACE_Monitor_Control_la_SOURCES = \ - Auto_Update_Starter.cpp \ - BSD_Network_Interface_Monitor.cpp \ - Bytes_Received_Monitor.cpp \ - Bytes_Sent_Monitor.cpp \ - CPU_Load_Monitor.cpp \ - Constraint_Interpreter.cpp \ - Constraint_Visitor.cpp \ - FreeBSD_Network_Interface_Monitor.cpp \ - Linux_Network_Interface_Monitor.cpp \ - Memory_Usage_Monitor.cpp \ - Monitor_Group.cpp \ - Monitor_Query.cpp \ - Null_Network_Interface_Monitor.cpp \ - Num_Threads_Monitor.cpp \ - Packets_Received_Monitor.cpp \ - Packets_Sent_Monitor.cpp \ - Solaris_Network_Interface_Monitor.cpp \ - Windows_Monitor.cpp \ - Windows_Multi_Instance_Monitor.cpp - -libACE_Monitor_Control_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACE_Monitor_Control_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - Auto_Update_Starter.h \ - BSD_Network_Interface_Monitor.h \ - Bytes_Received_Monitor.h \ - Bytes_Sent_Monitor.h \ - CPU_Load_Monitor.h \ - Constraint_Interpreter.h \ - Constraint_Visitor.h \ - FreeBSD_Network_Interface_Monitor.h \ - Linux_Network_Interface_Monitor.h \ - Memory_Usage_Monitor.h \ - Monitor_Control.h \ - Monitor_Control_export.h \ - Monitor_Control_utils.h \ - Monitor_Group.h \ - Monitor_Query.h \ - Num_Threads_Monitor.h \ - Packets_Received_Monitor.h \ - Packets_Sent_Monitor.h \ - Solaris_Network_Interface_Monitor.h \ - Windows_Monitor.h \ - Windows_Multi_Instance_Monitor.h - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ace/QoS/Makefile.am b/ACE/ace/QoS/Makefile.am deleted file mode 100644 index c48750d77a7..00000000000 --- a/ACE/ace/QoS/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu - -includedir = @includedir@/ace/QoS -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.QoS.am - -if BUILD_QOS - -lib_LTLIBRARIES = libACE_QoS.la - -libACE_QoS_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_QoS_BUILD_DLL - -libACE_QoS_la_SOURCES = \ - QoS_Decorator.cpp \ - QoS_Manager.cpp \ - QoS_Session_Factory.cpp \ - QoS_Session_Impl.cpp \ - SOCK_Dgram_Mcast_QoS.cpp - -libACE_QoS_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACE_QoS_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - ACE_QoS_Export.h \ - QoS_Decorator.h \ - QoS_Manager.h \ - QoS_Session.h \ - QoS_Session_Factory.h \ - QoS_Session_Impl.h \ - QoS_Session_Impl.inl \ - SOCK_Dgram_Mcast_QoS.h \ - SOCK_Dgram_Mcast_QoS.inl - -pkgconfig_DATA = \ - ACE_QoS.pc - -CLEANFILES = \ - ACE_QoS.pc - -ACE_QoS.pc: ${top_builddir}/config.status ${srcdir}/ACE_QoS.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_QoS.pc.in - -endif BUILD_QOS - -EXTRA_DIST = \ - ACE_QoS.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ace/QoS/README b/ACE/ace/QoS/README index 4415bf1862b..3bdd200e79c 100644 --- a/ACE/ace/QoS/README +++ b/ACE/ace/QoS/README @@ -13,7 +13,7 @@ AQoSA makes use of the GQOS API under Windows 2000. The minimum requirements are: 1. June98 Platform SDK or later. -2. Link with ws2_32.lib +2. Link with ws2_32.lib More information about GQOS is available from the MSDN website: http://msdn.microsoft.com/msdn-files/026/002/258/Search.asp @@ -35,9 +35,9 @@ PLATFORM_RAPI_CPPFLAGS += -I[path to RAPI header files] PLATFORM_RAPI_LIBS += -lrsvp PLATFORM_RAPI_LDFLAGS += -L[path to RAPI library files] -1. Compile AQoSA with - - make rapi=1 +1. Compile AQoSA with + + make rapi=1 More information about RAPI can be found at: diff --git a/ACE/ace/SSL/Makefile.am b/ACE/ace/SSL/Makefile.am deleted file mode 100644 index 3b244c2eab0..00000000000 --- a/ACE/ace/SSL/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace/SSL -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.SSL.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES = libACE_SSL.la - -libACE_SSL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - @ACE_TLS_CPPFLAGS@ \ - -DACE_SSL_BUILD_DLL - -libACE_SSL_la_SOURCES = \ - SSL_Asynch_BIO.cpp \ - SSL_Asynch_Stream.cpp \ - SSL_Context.cpp \ - SSL_SOCK.cpp \ - SSL_SOCK_Acceptor.cpp \ - SSL_SOCK_Connector.cpp \ - SSL_SOCK_Stream.cpp - -libACE_SSL_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ @ACE_TLS_LDFLAGS@ - -libACE_SSL_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -nobase_include_HEADERS = \ - SSL_Asynch_BIO.h \ - SSL_Asynch_Stream.h \ - SSL_Asynch_Stream.inl \ - SSL_Context.h \ - SSL_Context.inl \ - SSL_Export.h \ - SSL_SOCK.h \ - SSL_SOCK.inl \ - SSL_SOCK_Acceptor.h \ - SSL_SOCK_Acceptor.inl \ - SSL_SOCK_Connector.h \ - SSL_SOCK_Connector.inl \ - SSL_SOCK_Stream.h \ - SSL_SOCK_Stream.inl \ - sslconf.h - -pkgconfig_DATA = \ - ACE_SSL.pc - -CLEANFILES = \ - ACE_SSL.pc - -ACE_SSL.pc: ${top_builddir}/config.status ${srcdir}/ACE_SSL.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_SSL.pc.in - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -EXTRA_DIST = \ - ACE_SSL.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index a1cde15dcf3..25346ad2506 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -61,8 +61,8 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec) this->tv_.tv_sec = sec; this->tv_.tv_usec = usec; #if __GNUC__ - if (__builtin_constant_p(sec) && - __builtin_constant_p(usec) && + if ((__builtin_constant_p(sec) & + __builtin_constant_p(usec)) && (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS)) return; #endif diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index e48bb15ec9d..374adc46ff2 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -5,5 +5,5 @@ #define ACE_MAJOR_VERSION 6 #define ACE_MINOR_VERSION 0 -#define ACE_BETA_VERSION 4 -#define ACE_VERSION "6.0.4" +#define ACE_BETA_VERSION 5 +#define ACE_VERSION "6.0.5" diff --git a/ACE/ace/config-macosx-lion.h b/ACE/ace/config-macosx-lion.h index 76dbaf8916b..12c19660469 100644 --- a/ACE/ace/config-macosx-lion.h +++ b/ACE/ace/config-macosx-lion.h @@ -1,6 +1,6 @@ // $Id$ -#ifndef ACE_CONFIG_MACOSX_SNOWLEOPARD_H -#define ACE_CONFIG_MACOSX_SNOWLEOPARD_H +#ifndef ACE_CONFIG_MACOSX_LION_H +#define ACE_CONFIG_MACOSX_LION_H #include "ace/config-macosx-leopard.h" @@ -16,4 +16,4 @@ #define ACE_LACKS_UCONTEXT_H -#endif // ACE_CONFIG_MACOSX_SNOWLEOPARD_H +#endif // ACE_CONFIG_MACOSX_LION_H diff --git a/ACE/apps/Gateway/Gateway/Makefile.am b/ACE/apps/Gateway/Gateway/Makefile.am deleted file mode 100644 index 5312eb331cb..00000000000 --- a/ACE/apps/Gateway/Gateway/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Gateway.am - -noinst_LTLIBRARIES = libGateway.la - -libGateway_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -libGateway_la_SOURCES = \ - Concrete_Connection_Handlers.cpp \ - Config_Files.cpp \ - Connection_Handler.cpp \ - Connection_Handler_Acceptor.cpp \ - Connection_Handler_Connector.cpp \ - Event_Channel.cpp \ - Event_Forwarding_Discriminator.cpp \ - File_Parser.cpp \ - Gateway.cpp \ - Options.cpp - -noinst_HEADERS = \ - Concrete_Connection_Handlers.h \ - Config_Files.h \ - Connection_Handler.h \ - Connection_Handler_Acceptor.h \ - Connection_Handler_Connector.h \ - Event_Channel.h \ - Event_Forwarding_Discriminator.h \ - File_Parser.h \ - Gateway.h \ - Options.h - -## Makefile.gatewayd.am - -noinst_PROGRAMS = gatewayd - -gatewayd_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -gatewayd_SOURCES = \ - gatewayd.cpp \ - Concrete_Connection_Handlers.h \ - Config_Files.h \ - Connection_Handler.h \ - Connection_Handler_Acceptor.h \ - Connection_Handler_Connector.h \ - Consumer_Dispatch_Set.h \ - Event.h \ - Event_Channel.h \ - Event_Forwarding_Discriminator.h \ - File_Parser.h \ - Gateway.h \ - Options.h - -gatewayd_LDADD = \ - libGateway.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/Gateway/Makefile.am b/ACE/apps/Gateway/Makefile.am deleted file mode 100644 index e0b818fd319..00000000000 --- a/ACE/apps/Gateway/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Gateway \ - Peer - diff --git a/ACE/apps/Gateway/Peer/Makefile.am b/ACE/apps/Gateway/Peer/Makefile.am deleted file mode 100644 index b17b963b7b8..00000000000 --- a/ACE/apps/Gateway/Peer/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Gateway_Peer.am - -noinst_LTLIBRARIES = libGateway_Peer.la - -libGateway_Peer_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -libGateway_Peer_la_SOURCES = \ - Options.cpp \ - Peer.cpp - -noinst_HEADERS = \ - Options.h \ - Peer.h - -## Makefile.gateway_peerd.am - -noinst_PROGRAMS = peerd - -peerd_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -peerd_SOURCES = \ - peerd.cpp \ - Options.h \ - Peer.h - -peerd_LDADD = \ - libGateway_Peer.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/Gateway/README b/ACE/apps/Gateway/README index 7861e1051e9..c8c58283594 100644 --- a/ACE/apps/Gateway/README +++ b/ACE/apps/Gateway/README @@ -1,3 +1,5 @@ +$Id$ + OVERVIEW This directory contains source code for an application-level diff --git a/ACE/apps/JAWS/Makefile.am b/ACE/apps/JAWS/Makefile.am deleted file mode 100644 index c922c992902..00000000000 --- a/ACE/apps/JAWS/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - clients \ - server - diff --git a/ACE/apps/JAWS/README b/ACE/apps/JAWS/README index e67da72afd1..c6ba4302e9f 100644 --- a/ACE/apps/JAWS/README +++ b/ACE/apps/JAWS/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains the source code and test examples for JAWS, which is a high-performance HTTP Web server written with ACE. For more information on JAWS, please see diff --git a/ACE/apps/JAWS/clients/Blobby/Makefile.am b/ACE/apps/JAWS/clients/Blobby/Makefile.am deleted file mode 100644 index 1e0071f74d1..00000000000 --- a/ACE/apps/JAWS/clients/Blobby/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.blobby.am - -noinst_PROGRAMS = blobby - -blobby_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -blobby_SOURCES = \ - Blob.cpp \ - Blob_Handler.cpp \ - Options.cpp \ - blobby.cpp \ - Blob.h \ - Blob_Handler.h \ - Options.h - -blobby_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/JAWS/clients/Blobby/README b/ACE/apps/JAWS/clients/Blobby/README index 1a1cadf91ca..5a0aa2f4e36 100644 --- a/ACE/apps/JAWS/clients/Blobby/README +++ b/ACE/apps/JAWS/clients/Blobby/README @@ -1,3 +1,5 @@ +$Id$ + README for blobby, the example application for JAWS --------------------------------------------------- @@ -29,5 +31,5 @@ It accepts the following command line arguments: -l length The number of bytes to read/write from the server -o offset The offset into the file to be read/written - -d Puts blobby into debug mode, where it echoes + -d Puts blobby into debug mode, where it echoes its command line arguments diff --git a/ACE/apps/JAWS/clients/Caching/Makefile.am b/ACE/apps/JAWS/clients/Caching/Makefile.am deleted file mode 100644 index fa89230d919..00000000000 --- a/ACE/apps/JAWS/clients/Caching/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.http_client.am - -if BUILD_ACE_FILECACHE -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = http_client - -http_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -http_client_SOURCES = \ - http_client.cpp \ - http_handler.cpp \ - Local_Locator.inl \ - Locator_Request_Reply.inl \ - URL_Properties.inl \ - http_handler.h - -http_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_FILECACHE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/JAWS/clients/Caching/README b/ACE/apps/JAWS/clients/Caching/README index 3dcfcd32815..89e46b3cb72 100644 --- a/ACE/apps/JAWS/clients/Caching/README +++ b/ACE/apps/JAWS/clients/Caching/README @@ -1,5 +1,6 @@ # -*- text -*- # Hey, Emacs! This is a TEXT file. +# $Id$ ---------------------------------- README for the caching http_client diff --git a/ACE/apps/JAWS/clients/Makefile.am b/ACE/apps/JAWS/clients/Makefile.am deleted file mode 100644 index 76571aa387d..00000000000 --- a/ACE/apps/JAWS/clients/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Blobby \ - Caching - diff --git a/ACE/apps/JAWS/clients/README b/ACE/apps/JAWS/clients/README index e35d7af53c9..1ed215994f4 100644 --- a/ACE/apps/JAWS/clients/README +++ b/ACE/apps/JAWS/clients/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains the source code for various clients related to JAWS, which is a high-performance HTTP Web server written with ACE. For more information on JAWS, please see diff --git a/ACE/apps/JAWS/clients/WebSTONE/README b/ACE/apps/JAWS/clients/WebSTONE/README index 2d024b925a1..a2cb9acfe0e 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/README +++ b/ACE/apps/JAWS/clients/WebSTONE/README @@ -1,3 +1,5 @@ +$Id$ + README WebStone 2.0.1 bug fix release Proxy server bug fixed (now correctly handles proxy server) Error reading page_stats error fixed @@ -42,7 +44,7 @@ lack of conformity in Webstone performance quotes. be documented, as well as HTTPD server version and configuration information such as logging, DNS lookups and number of threads. - + README - WebStone 2.0beta6 WARNING: Do not compare WebStone 2.0 results with WebStone 1.0 results. @@ -63,7 +65,7 @@ This is the WebStone benchmark. Quick and dirty install: This may not be necessary, since IRIX binaries are included. - edit conf/testbed to reflect your site See the doc/FAQ-webstone.html for details. - - ./webstone -genfiles will put the files in conf/fileset + - ./webstone -genfiles will put the files in conf/fileset onto your Web server. - ./webstone - to display a table of results: ./webstone -results @@ -78,7 +80,7 @@ Files of interest: README: This document. README.FIRST: Quick and dirty directions. README.DynamicWorkload: Information on the CGI and NSAPI workloads. - webstone: wrapper shell script for everything. + webstone: wrapper shell script for everything. Takes options: -gui: start the GUI mode -kill: kill stray WebStone processes @@ -106,7 +108,7 @@ Files of interest (./bin): Files of interest (./conf): filelist: default list of files on the Web server, with workload description. - filelist.photo: Model of a popular Web site + filelist.photo: Model of a popular Web site containing photographic images. filelist.ss: Model of SGI's Silicon Surf WWW site. fileset: list of files for genfiles to create. @@ -214,7 +216,7 @@ Release Notes (1.0 final): Release Notes (1.0b3): * New Web browser GUI NOTE: most Web browsers take up substantial CPU time. - If you run the GUI, we recommend that you make the controller + If you run the GUI, we recommend that you make the controller a separate machine, and don't run any WebStone clients on it. * Minor bug fixes Squashed some dubious error messages, fixed some client- @@ -228,18 +230,18 @@ Release Notes (1.0b3): LEGAL STUFF: -This file and all files contained in this directory are +This file and all files contained in this directory are copyright 1995, Silicon Graphics, Inc. -This software is provided without support and without any obligation on the -part of Silicon Graphics, Inc. to assist in its use, correction, modification -or enhancement. There is no guarantee that this software will be included in +This software is provided without support and without any obligation on the +part of Silicon Graphics, Inc. to assist in its use, correction, modification +or enhancement. There is no guarantee that this software will be included in future software releases, and it probably will not be included. -THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE -WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, -OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. +THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE +WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, +OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. -In no event will Silicon Graphics, Inc. be liable for any lost revenue or -profits or other special, indirect and consequential damages, even if -Silicon Graphics, Inc. has been advised of the possibility of such damages.
\ No newline at end of file +In no event will Silicon Graphics, Inc. be liable for any lost revenue or +profits or other special, indirect and consequential damages, even if +Silicon Graphics, Inc. has been advised of the possibility of such damages.
\ No newline at end of file diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist b/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist index 4cc2d11c49e..b057b86962d 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/checkfilelist @@ -1,13 +1,10 @@ #! /bin/sh -# -# NAME # checkfilelist - try retrieving files from server # -# SYNOPSIS # checkfilelist servername portno filelist # -# +# $Id$ if test "$#" -lt 3 ; then echo "usage: $0 servername portno filelist" diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles b/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles index d5f06aee6df..90f8e4a4696 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles @@ -1,5 +1,5 @@ #! /bin/sh -# +# $Id$ # get configuration . $WEBSTONEROOT/conf/testbed diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh b/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh index 1293709238c..7da639ad1b6 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/genfiles-from-filelist.sh @@ -1,5 +1,5 @@ #!/bin/sh -# +# $Id$ # get configuration [ -n "$WEBSTONEROOT" ] || WEBSTONEROOT=`pwd`/.. diff --git a/ACE/apps/JAWS/clients/WebSTONE/conf/paths.sh b/ACE/apps/JAWS/clients/WebSTONE/conf/paths.sh index e69de29bb2d..854ec652fd2 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/conf/paths.sh +++ b/ACE/apps/JAWS/clients/WebSTONE/conf/paths.sh @@ -0,0 +1 @@ +# $Id$
\ No newline at end of file diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/README b/ACE/apps/JAWS/clients/WebSTONE/src/README index 2061342b7ae..e94737874d2 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/README +++ b/ACE/apps/JAWS/clients/WebSTONE/src/README @@ -1,3 +1,5 @@ +$Id$ + README WebStone 2.0 Release version WARNING: WebStone 2.0 results should not be compared with WebStone 1.1 @@ -29,7 +31,7 @@ lack of conformity in Webstone performance quotes. be documented, as well as HTTPD server version and configuration information such as logging, DNS lookups and number of threads. - + README - WebStone 2.0beta6 WARNING: Do not compare WebStone 2.0 results with WebStone 1.0 results. @@ -50,7 +52,7 @@ This is the WebStone benchmark. Quick and dirty install: This may not be necessary, since IRIX binaries are included. - edit conf/testbed to reflect your site See the doc/FAQ-webstone.html for details. - - ./webstone -genfiles will put the files in conf/fileset + - ./webstone -genfiles will put the files in conf/fileset onto your Web server. - ./webstone - to display a table of results: ./webstone -results @@ -65,7 +67,7 @@ Files of interest: README: This document. README.FIRST: Quick and dirty directions. README.DynamicWorkload: Information on the CGI and NSAPI workloads. - webstone: wrapper shell script for everything. + webstone: wrapper shell script for everything. Takes options: -gui: start the GUI mode -kill: kill stray WebStone processes @@ -93,7 +95,7 @@ Files of interest (./bin): Files of interest (./conf): filelist: default list of files on the Web server, with workload description. - filelist.photo: Model of a popular Web site + filelist.photo: Model of a popular Web site containing photographic images. filelist.ss: Model of SGI's Silicon Surf WWW site. fileset: list of files for genfiles to create. @@ -201,7 +203,7 @@ Release Notes (1.0 final): Release Notes (1.0b3): * New Web browser GUI NOTE: most Web browsers take up substantial CPU time. - If you run the GUI, we recommend that you make the controller + If you run the GUI, we recommend that you make the controller a separate machine, and don't run any WebStone clients on it. * Minor bug fixes Squashed some dubious error messages, fixed some client- @@ -215,18 +217,18 @@ Release Notes (1.0b3): LEGAL STUFF: -This file and all files contained in this directory are +This file and all files contained in this directory are copyright 1995, Silicon Graphics, Inc. -This software is provided without support and without any obligation on the -part of Silicon Graphics, Inc. to assist in its use, correction, modification -or enhancement. There is no guarantee that this software will be included in +This software is provided without support and without any obligation on the +part of Silicon Graphics, Inc. to assist in its use, correction, modification +or enhancement. There is no guarantee that this software will be included in future software releases, and it probably will not be included. -THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE -WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, -OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. +THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE +WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, +OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. -In no event will Silicon Graphics, Inc. be liable for any lost revenue or -profits or other special, indirect and consequential damages, even if -Silicon Graphics, Inc. has been advised of the possibility of such damages. +In no event will Silicon Graphics, Inc. be liable for any lost revenue or +profits or other special, indirect and consequential damages, even if +Silicon Graphics, Inc. has been advised of the possibility of such damages. diff --git a/ACE/apps/JAWS/server/Makefile.am b/ACE/apps/JAWS/server/Makefile.am deleted file mode 100644 index 70fa5f67798..00000000000 --- a/ACE/apps/JAWS/server/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.JAWS.am - -if BUILD_ACE_FILECACHE -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES = libJAWS.la - -libJAWS_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_SVC_DLL - -libJAWS_la_SOURCES = \ - HTTP_Config.cpp \ - HTTP_Handler.cpp \ - HTTP_Helpers.cpp \ - HTTP_Request.cpp \ - HTTP_Response.cpp \ - HTTP_Server.cpp \ - JAWS_IO.cpp \ - JAWS_Concurrency.cpp \ - JAWS_Pipeline.cpp \ - Parse_Headers.cpp - -noinst_HEADERS = \ - HTTP_Config.h \ - HTTP_Handler.h \ - HTTP_Helpers.h \ - HTTP_Request.h \ - HTTP_Response.h \ - HTTP_Server.h \ - JAWS_IO.h \ - JAWS_Concurrency.h \ - JAWS_Pipeline.h \ - Parse_Headers.h - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_FILECACHE - -## Makefile.JAWS_server.am - -if BUILD_ACE_FILECACHE -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -main_SOURCES = \ - main.cpp \ - HTTP_Config.h \ - HTTP_Handler.h \ - HTTP_Helpers.h \ - HTTP_Request.h \ - HTTP_Response.h \ - HTTP_Server.h \ - IO.h \ - JAWS_Concurrency.h \ - JAWS_Pipeline.h \ - JAWS_Pipeline_Handler.h \ - Parse_Headers.h - -main_LDADD = \ - libJAWS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_FILECACHE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/JAWS/server/README b/ACE/apps/JAWS/server/README index 27f0a0e3a8d..18912c61b8d 100644 --- a/ACE/apps/JAWS/server/README +++ b/ACE/apps/JAWS/server/README @@ -1,11 +1,12 @@ # -*- text -*- # Hey, Emacs! This is a TEXT file. +# $Id$ -------------------------- README for the JAWS server -------------------------- -This is the README file for the JAWS server. +This is the README file for the JAWS server. CONTENTS @@ -168,7 +169,7 @@ status|task | | (c) JAWS will support a general protocol content filtering | mechanism which will be used to replace the existing CGI - | support implementation. + | support implementation. | Questions, comments, corrections, suggestions are welcome. Please @@ -211,17 +212,17 @@ functionality and provided a new cmd line option -c with params NO_CACHE/CACHE. This capability is to be used with the RepositoryManager in CIAO. -In its current design the RepositoryManager (RM) need a collocated HTTP server. +In its current design the RepositoryManager (RM) need a collocated HTTP server. When RM istalls packages, it unpacks them so that the separate files are accessible to ZIP unaware entities like JAWS. JAWS is used to serve the libraries in the package to the various deamons that might be interested in them, e.g. the NodeApplicationManager. -The problem with using file caching reveals itself during the deletePackage operation of -the RM. When the RM attempts to delete a file which was previously accessed via JAWS a -is currently in the file cache the call fails and the file remains on the filesystem +The problem with using file caching reveals itself during the deletePackage operation of +the RM. When the RM attempts to delete a file which was previously accessed via JAWS a +is currently in the file cache the call fails and the file remains on the filesystem indefinitely. If the file is cached with a ACE_NOMAP option is is not stored in a file map and it is deleted upon server termination. The OS handles that. Althoguh this might -or might not be OK (depending on how it scales) there is an additional problem because +or might not be OK (depending on how it scales) there is an additional problem because JAWS and the ACE_Filecache_Handle class used do not provide enough functionality to deal with the ACE_NOMAP case. I believe that ACE_NOMAP option was probably never used. diff --git a/ACE/apps/JAWS/stress_testing/README b/ACE/apps/JAWS/stress_testing/README index 0969522d638..167623f9813 100644 --- a/ACE/apps/JAWS/stress_testing/README +++ b/ACE/apps/JAWS/stress_testing/README @@ -1,3 +1,5 @@ +$Id$ + http_tester ----------- @@ -46,7 +48,7 @@ The output file consists of the following space delimited fields: Experiment Id (string) Average throughput of connection (float) -Average latency of connection (float) +Average latency of connection (float) Maximum number of active connections at any given time (int) diff --git a/ACE/apps/JAWS2/HTTPU/Makefile.am b/ACE/apps/JAWS2/HTTPU/Makefile.am deleted file mode 100644 index cd9ae09ec7d..00000000000 --- a/ACE/apps/JAWS2/HTTPU/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.HTTPU.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES = libHTTPU.la - -libHTTPU_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. \ - -DHTTPU_BUILD_DLL - -libHTTPU_la_SOURCES = \ - http_base.cpp \ - http_headers.cpp \ - http_request.cpp \ - http_response.cpp \ - http_status.cpp \ - parse_http_request.cpp \ - parse_http_response.cpp \ - parse_url.cpp - -noinst_HEADERS = \ - http_base.h \ - http_base.inl \ - http_export.h \ - http_headers.h \ - http_headers.inl \ - http_request.h \ - http_request.inl \ - http_response.h \ - http_response.inl \ - http_status.h \ - http_status.inl \ - parse_http_request.h \ - parse_http_request.inl \ - parse_http_response.h \ - parse_http_response.inl \ - parse_url.h - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/JAWS2/JAWS/Makefile.am b/ACE/apps/JAWS2/JAWS/Makefile.am deleted file mode 100644 index 99bd5bce9d0..00000000000 --- a/ACE/apps/JAWS2/JAWS/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.JAWS2.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES = libJAWS2.la - -libJAWS2_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. \ - -DJAWS_BUILD_DLL - -libJAWS2_la_SOURCES = \ - Assoc_Array.cpp \ - Cache_Manager.cpp \ - Cache_Object.cpp \ - Concurrency.cpp \ - Data_Block.cpp \ - FILE.cpp \ - Filecache.cpp \ - Headers.cpp \ - Jaws_IO.cpp \ - IO_Acceptor.cpp \ - IO_Handler.cpp \ - Parse_Headers.cpp \ - Pipeline.cpp \ - Pipeline_Tasks.cpp \ - Policy.cpp \ - Reaper.cpp \ - Server.cpp \ - Waiter.cpp - -noinst_HEADERS = \ - Assoc_Array.h \ - Cache_Hash_T.cpp \ - Cache_Hash_T.h \ - Cache_Heap_T.cpp \ - Cache_Heap_T.h \ - Cache_List_T.cpp \ - Cache_List_T.h \ - Cache_Manager.h \ - Cache_Manager_T.cpp \ - Cache_Manager_T.h \ - Cache_Object.h \ - Concurrency.h \ - Data_Block.h \ - Export.h \ - FILE.h \ - Filecache.h \ - Hash_Bucket_T.cpp \ - Hash_Bucket_T.h \ - Headers.h \ - Jaws_IO.h \ - IO_Acceptor.h \ - IO_Handler.h \ - Parse_Headers.h \ - Pipeline.h \ - Pipeline_Handler_T.cpp \ - Pipeline_Handler_T.h \ - Pipeline_Tasks.h \ - Policy.h \ - Reaper.h \ - Server.h \ - Waiter.h - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/JAWS2/Makefile.am b/ACE/apps/JAWS2/Makefile.am deleted file mode 100644 index d3e0377d4f4..00000000000 --- a/ACE/apps/JAWS2/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - JAWS \ - HTTPU - diff --git a/ACE/apps/JAWS2/README b/ACE/apps/JAWS2/README index dae52514354..54737abf5e3 100644 --- a/ACE/apps/JAWS2/README +++ b/ACE/apps/JAWS2/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains the source code to the JAWS framework as described in Object-Oriented Application Frameworks, Volume 3. diff --git a/ACE/apps/JAWS3/Makefile.am b/ACE/apps/JAWS3/Makefile.am deleted file mode 100644 index 84294e864f3..00000000000 --- a/ACE/apps/JAWS3/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - jaws3 - diff --git a/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/README b/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/README index 3f1a2255925..4029e527b5b 100644 --- a/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/README +++ b/ACE/apps/JAWS3/contrib/jmills_at_tga_dot_com/README @@ -1,3 +1,4 @@ +$Id$ James - diff --git a/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/README b/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/README index be1eec7c05e..9e355cae63a 100644 --- a/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/README +++ b/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/README @@ -1,3 +1,5 @@ +$Id$ + "John Buckman" <john@lyris.com> I have not looked to see what you're using the signal handler for, but diff --git a/ACE/apps/JAWS3/jaws3/Makefile.am b/ACE/apps/JAWS3/jaws3/Makefile.am deleted file mode 100644 index 96751258f06..00000000000 --- a/ACE/apps/JAWS3/jaws3/Makefile.am +++ /dev/null @@ -1,138 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.JAWS3.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES = libJAWS3.la - -libJAWS3_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. \ - -DJAWS_BUILD_DLL - -libJAWS3_la_SOURCES = \ - Asynch_IO.cpp \ - Concurrency.cpp \ - Config_File.cpp \ - Datagram.cpp \ - Event_Completer.cpp \ - Event_Dispatcher.cpp \ - FILE.cpp \ - Jaws_IO.cpp \ - Options.cpp \ - Protocol_Handler.cpp \ - Reactive_IO.cpp \ - Signal_Task.cpp \ - Symbol_Table.cpp \ - Synch_IO.cpp \ - THYBRID_Concurrency.cpp \ - TPOOL_Concurrency.cpp \ - TPR_Concurrency.cpp \ - Task_Timer.cpp \ - Templates.cpp \ - Timer.cpp \ - Timer_Helpers.cpp - -noinst_HEADERS = \ - Asynch_IO.h \ - Asynch_IO_Helpers.h \ - Cached_Allocator_T.cpp \ - Cached_Allocator_T.h \ - Concurrency.h \ - Concurrency_T.cpp \ - Concurrency_T.h \ - Config_File.h \ - Datagram.h \ - Event_Completer.h \ - Event_Dispatcher.h \ - Event_Result.h \ - Export.h \ - FILE.h \ - Jaws_IO.h \ - Options.h \ - Protocol_Handler.h \ - Reactive_IO.h \ - Reactive_IO_Helpers.h \ - Signal_Task.h \ - Symbol_Table.h \ - Synch_IO.h \ - THYBRID_Concurrency.h \ - TPOOL_Concurrency.h \ - TPR_Concurrency.h \ - Task_Timer.h \ - Timer.h \ - Timer_Helpers.h - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.JAWS3_server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. - -main_SOURCES = \ - main.cpp \ - Asynch_IO.h \ - Asynch_IO_Helpers.h \ - Cached_Allocator_T.h \ - Concurrency.h \ - Concurrency_T.h \ - Config_File.h \ - Datagram.h \ - Event_Completer.h \ - Event_Dispatcher.h \ - Event_Result.h \ - Export.h \ - FILE.h \ - IO.h \ - Options.h \ - Protocol_Handler.h \ - Reactive_IO.h \ - Reactive_IO_Helpers.h \ - Signal_Task.h \ - Symbol_Table.h \ - Synch_IO.h \ - THYBRID_Concurrency.h \ - TPOOL_Concurrency.h \ - TPR_Concurrency.h \ - Task_Timer.h \ - Timer.h \ - Timer_Helpers.h - -main_LDADD = \ - libJAWS3.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/JAWS3/zREADME b/ACE/apps/JAWS3/zREADME index db07132d77f..52e190093ff 100644 --- a/ACE/apps/JAWS3/zREADME +++ b/ACE/apps/JAWS3/zREADME @@ -1,3 +1,5 @@ +$Id$ + The framework is organized roughly around these high level component categories. The sublevels indicate the JAWS components that participate in the category. diff --git a/ACE/apps/Makefile.am b/ACE/apps/Makefile.am deleted file mode 100644 index ec4c1062f63..00000000000 --- a/ACE/apps/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu - -OPTDIRS = - -if BUILD_GPERF -OPTDIRS += gperf -endif - -SUBDIRS = \ - Gateway \ - JAWS \ - JAWS2 \ - JAWS3 \ - drwho \ - mkcsregdb \ - soreduce \ - $(OPTDIRS) diff --git a/ACE/apps/README b/ACE/apps/README index 742b3ec993f..55c4d2793df 100644 --- a/ACE/apps/README +++ b/ACE/apps/README @@ -1,27 +1,29 @@ +$Id$ + The subdirectories in this directory provide a number of complete applications that utilize the ACE features. . drwho - This provides a "Distributed RWHO (drwho)" utility that gets around certain rwho limitations, adds functionality, and also prints a much prettier listing of - who's logged in around a network. + who's logged in around a network. . Gateway -- Implements a connection-oriented application-level gateway that uses source-based and destination-based routing of messages between peers connected via TCP/IP networks. - + . gperf -- The GNU perfect hash function generator. This has now been integrated into the TAO IDL compiler, where it is used for generating the lookup function for operation names associated with IDL interfaces. . JAWS -- This is a high-performance HTTP 1.0 web server - written with ACE. It illustrates a number of sophisticated ACE + written with ACE. It illustrates a number of sophisticated ACE concurrency and event demultiplexing strategies. . JAWS2 is an implementation of HTTP/1.0 similar to JAWS. It has no HTTP/1.1 features. It extends JAWS to add a more - flexible I/O and concurrency framework utilizing strategies. + flexible I/O and concurrency framework utilizing strategies. . JAWS3 is a framework that provides a state-machine interface to developing a server, but it does not implement HTTP. diff --git a/ACE/apps/drwho/Makefile.am b/ACE/apps/drwho/Makefile.am deleted file mode 100644 index 286cd94c343..00000000000 --- a/ACE/apps/drwho/Makefile.am +++ /dev/null @@ -1,214 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.drwho__client.am - -if BUILD_RWHO -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - BS_Client.cpp \ - BS_Server.cpp \ - Binary_Search.cpp \ - CM_Client.cpp \ - CM_Server.cpp \ - Comm_Manager.cpp \ - Drwho_Node.cpp \ - File_Manager.cpp \ - HT_Client.cpp \ - HT_Server.cpp \ - Hash_Table.cpp \ - Multicast_Manager.cpp \ - Options.cpp \ - PMC_All.cpp \ - PMC_Flo.cpp \ - PMC_Ruser.cpp \ - PMC_Usr.cpp \ - PMS_All.cpp \ - PMS_Flo.cpp \ - PMS_Ruser.cpp \ - PMS_Usr.cpp \ - PM_Client.cpp \ - PM_Server.cpp \ - Protocol_Manager.cpp \ - Protocol_Record.cpp \ - Rwho_DB_Manager.cpp \ - SL_Client.cpp \ - SL_Server.cpp \ - SML_Client.cpp \ - SML_Server.cpp \ - SMR_Client.cpp \ - SMR_Server.cpp \ - SM_Client.cpp \ - SM_Server.cpp \ - Search_Struct.cpp \ - Select_Manager.cpp \ - Single_Lookup.cpp \ - client.cpp \ - BS_Client.h \ - BS_Server.h \ - Binary_Search.h \ - CM_Client.h \ - CM_Server.h \ - Comm_Manager.h \ - Drwho_Node.h \ - File_Manager.h \ - HT_Client.h \ - HT_Server.h \ - Hash_Table.h \ - Multicast_Manager.h \ - Options.h \ - PMC_All.h \ - PMC_Flo.h \ - PMC_Ruser.h \ - PMC_Usr.h \ - PMS_All.h \ - PMS_Flo.h \ - PMS_Ruser.h \ - PMS_Usr.h \ - PM_Client.h \ - PM_Server.h \ - Protocol_Manager.h \ - Protocol_Record.h \ - Rwho_DB_Manager.h \ - SL_Client.h \ - SL_Server.h \ - SML_Client.h \ - SML_Server.h \ - SMR_Client.h \ - SMR_Server.h \ - SM_Client.h \ - SM_Server.h \ - Search_Struct.h \ - Select_Manager.h \ - Single_Lookup.h - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO -endif BUILD_RWHO - -## Makefile.drwho__server.am - -if BUILD_RWHO -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_SOURCES = \ - BS_Client.cpp \ - BS_Server.cpp \ - Binary_Search.cpp \ - CM_Client.cpp \ - CM_Server.cpp \ - Comm_Manager.cpp \ - Drwho_Node.cpp \ - File_Manager.cpp \ - HT_Client.cpp \ - HT_Server.cpp \ - Hash_Table.cpp \ - Multicast_Manager.cpp \ - Options.cpp \ - PMC_All.cpp \ - PMC_Flo.cpp \ - PMC_Ruser.cpp \ - PMC_Usr.cpp \ - PMS_All.cpp \ - PMS_Flo.cpp \ - PMS_Ruser.cpp \ - PMS_Usr.cpp \ - PM_Client.cpp \ - PM_Server.cpp \ - Protocol_Manager.cpp \ - Protocol_Record.cpp \ - Rwho_DB_Manager.cpp \ - SL_Client.cpp \ - SL_Server.cpp \ - SML_Client.cpp \ - SML_Server.cpp \ - SMR_Client.cpp \ - SMR_Server.cpp \ - SM_Client.cpp \ - SM_Server.cpp \ - Search_Struct.cpp \ - Select_Manager.cpp \ - Single_Lookup.cpp \ - server.cpp \ - BS_Client.h \ - BS_Server.h \ - Binary_Search.h \ - CM_Client.h \ - CM_Server.h \ - Comm_Manager.h \ - Drwho_Node.h \ - File_Manager.h \ - HT_Client.h \ - HT_Server.h \ - Hash_Table.h \ - Multicast_Manager.h \ - Options.h \ - PMC_All.h \ - PMC_Flo.h \ - PMC_Ruser.h \ - PMC_Usr.h \ - PMS_All.h \ - PMS_Flo.h \ - PMS_Ruser.h \ - PMS_Usr.h \ - PM_Client.h \ - PM_Server.h \ - Protocol_Manager.h \ - Protocol_Record.h \ - Rwho_DB_Manager.h \ - SL_Client.h \ - SL_Server.h \ - SML_Client.h \ - SML_Server.h \ - SMR_Client.h \ - SMR_Server.h \ - SM_Client.h \ - SM_Server.h \ - Search_Struct.h \ - Select_Manager.h \ - Single_Lookup.h - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO -endif BUILD_RWHO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/drwho/README b/ACE/apps/drwho/README index af1c4b401c7..55d3f560997 100644 --- a/ACE/apps/drwho/README +++ b/ACE/apps/drwho/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains the "distributed rwho" (drwho) program. Drwho alleviates certain rwho(1) limitations. For instance it adds functionality that spans subnets. In addition, drwho prints a much @@ -16,7 +18,7 @@ commands: 1. Print out the command-line options. % drwho-client -h -usage: ./drwho-client +usage: ./drwho-client -? prints a short usage message -A append the following hostname to the list of predefined hostnames. -a return information on *all* users remotely logged in (uses yp passwd). @@ -37,7 +39,7 @@ usage: ./drwho-client -t set the amount of time we wait for servers to timeout. -w return information on just one user. ----------------------------------------- +---------------------------------------- 2. Find out which friends are logged in (* means currently active) @@ -120,7 +122,7 @@ or 4. Find out everyone who is logged in everywhere! -% drwho-client -A tango.cs.wustl.edu -r -a +% drwho-client -A tango.cs.wustl.edu -r -a remote users logged on ------------------------ rlneblet [ascc] diff --git a/ACE/apps/gperf/Makefile.am b/ACE/apps/gperf/Makefile.am deleted file mode 100644 index fe8badeca7b..00000000000 --- a/ACE/apps/gperf/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - - -SUBDIRS = \ - . \ - src \ - tests - -## Makefile.gperf_docs.am - -man_MANS = ace_gperf.1 - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/gperf/README b/ACE/apps/gperf/README index c1708c794c4..1da434549a1 100644 --- a/ACE/apps/gperf/README +++ b/ACE/apps/gperf/README @@ -1,3 +1,5 @@ +$Id$ + While teaching a data structures course at University of California, Irvine, I developed a program called GPERF that generates perfect hash functions for sets of key words. A perfect hash function is: diff --git a/ACE/apps/gperf/src/Makefile.am b/ACE/apps/gperf/src/Makefile.am deleted file mode 100644 index 48677172586..00000000000 --- a/ACE/apps/gperf/src/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.gperf.am - -if !BUILD_USES_WCHAR - -bin_PROGRAMS = ace_gperf - -ace_gperf_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ace_gperf_SOURCES = \ - Bool_Array.cpp \ - Gen_Perf.cpp \ - Hash_Table.cpp \ - Iterator.cpp \ - Key_List.cpp \ - List_Node.cpp \ - Options.cpp \ - Vectors.cpp \ - Version.cpp \ - gperf.cpp \ - Bool_Array.h \ - Gen_Perf.h \ - Hash_Table.h \ - Iterator.h \ - Key_List.h \ - List_Node.h \ - Options.h \ - Vectors.h - -ace_gperf_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/gperf/tests/Makefile.am b/ACE/apps/gperf/tests/Makefile.am deleted file mode 100644 index 3cfe88c83aa..00000000000 --- a/ACE/apps/gperf/tests/Makefile.am +++ /dev/null @@ -1,305 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -CLEANFILES = -BUILT_SOURCES = -noinst_PROGRAMS = - -## Makefile.adainset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - ada.cpp - -CLEANFILES += \ - ada.cpp - -ada.cpp: $(srcdir)/ada.gperf - ../src/ace_gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp - -noinst_PROGRAMS += aout - -aout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -aout_SOURCES = \ - ada.cpp \ - test.cpp - -aout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.cinset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - c.cpp - -CLEANFILES += \ - c.cpp - -c.cpp: $(srcdir)/c.gperf - ../src/ace_gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp - -noinst_PROGRAMS += cout - -cout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -cout_SOURCES = \ - c.cpp \ - test.cpp - -cout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.cppinset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - cpp.cpp - -CLEANFILES += \ - cpp.cpp - -cpp.cpp: $(srcdir)/cpp.gperf - ../src/ace_gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp - -noinst_PROGRAMS += cppout - -cppout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -cppout_SOURCES = \ - cpp.cpp \ - test.cpp - -cppout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.iinset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - idl.cpp - -CLEANFILES += \ - idl.cpp - -idl.cpp: $(srcdir)/idl.gperf - ../src/ace_gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp - -noinst_PROGRAMS += iout - -iout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -iout_SOURCES = \ - idl.cpp \ - test.cpp - -iout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.iinset2.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - iout2_gen/idl.cpp - -CLEANFILES += \ - iout2_gen/idl.cpp - -iout2_gen/idl.cpp: $(srcdir)/idl.gperf - mkdir -p iout2_gen - ../src/ace_gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp - -noinst_PROGRAMS += iout2 - -iout2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -iout2_SOURCES = \ - iout2_gen/idl.cpp \ - test.cpp - -iout2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.m3inset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - modula3.cpp - -CLEANFILES += \ - modula3.cpp - -modula3.cpp: $(srcdir)/modula3.gperf - ../src/ace_gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp - -noinst_PROGRAMS += m3out - -m3out_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -m3out_SOURCES = \ - modula3.cpp \ - test.cpp - -m3out_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.pinset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - pascal.cpp - -CLEANFILES += \ - pascal.cpp - -pascal.cpp: $(srcdir)/pascal.gperf - ../src/ace_gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp - -noinst_PROGRAMS += pout - -pout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -pout_SOURCES = \ - pascal.cpp \ - test.cpp - -pout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.preinset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - adadefs.cpp - -CLEANFILES += \ - adadefs.cpp - -adadefs.cpp: $(srcdir)/adadefs.gperf - ../src/ace_gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp - -noinst_PROGRAMS += preout - -preout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -preout_SOURCES = \ - adadefs.cpp \ - test.cpp - -preout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.taoinset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - tao.cpp - -CLEANFILES += \ - tao.cpp - -tao.cpp: $(srcdir)/tao.gperf - ../src/ace_gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp - -noinst_PROGRAMS += taoout - -taoout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -taoout_SOURCES = \ - tao.cpp \ - test.cpp - -taoout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.tinset.am - -if !BUILD_USES_WCHAR - -BUILT_SOURCES += \ - corba.cpp - -CLEANFILES += \ - corba.cpp - -corba.cpp: $(srcdir)/corba.gperf - ../src/ace_gperf -a -o $(srcdir)/corba.gperf > corba.cpp - -noinst_PROGRAMS += tout - -tout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tout_SOURCES = \ - corba.cpp \ - test.cpp - -tout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/mkcsregdb/Makefile.am b/ACE/apps/mkcsregdb/Makefile.am deleted file mode 100644 index 8c78d17d238..00000000000 --- a/ACE/apps/mkcsregdb/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.mkcsregdb.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = mkcsregdb - -mkcsregdb_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -mkcsregdb_SOURCES = \ - mkcsregdb.cpp - -mkcsregdb_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/mkcsregdb/code_set_registry1.2g.txt b/ACE/apps/mkcsregdb/code_set_registry1.2g.txt index 3e87317d5f0..899342d8019 100644 --- a/ACE/apps/mkcsregdb/code_set_registry1.2g.txt +++ b/ACE/apps/mkcsregdb/code_set_registry1.2g.txt @@ -1,3 +1,5 @@ +# $Id$ + start description ISO 8859-1:1987; Latin Alphabet No. 1 loc_name NONE diff --git a/ACE/apps/mkcsregdb/cs_test.txt b/ACE/apps/mkcsregdb/cs_test.txt index 93ba4033c49..d169bd210a4 100644 --- a/ACE/apps/mkcsregdb/cs_test.txt +++ b/ACE/apps/mkcsregdb/cs_test.txt @@ -1,3 +1,5 @@ +# $Id$ + start description ISO 8859-1:1987; Latin Alphabet No. 1 loc_name ASCII diff --git a/ACE/apps/mkcsregdb/iso_only.txt b/ACE/apps/mkcsregdb/iso_only.txt index 1b8cacb4d0e..6ecafe3aef7 100644 --- a/ACE/apps/mkcsregdb/iso_only.txt +++ b/ACE/apps/mkcsregdb/iso_only.txt @@ -1,3 +1,5 @@ +# $Id$ + start description ISO 8859-1:1987; Latin Alphabet No. 1 loc_name ASCII diff --git a/ACE/apps/soreduce/Makefile.am b/ACE/apps/soreduce/Makefile.am deleted file mode 100644 index 6b0efcb4b99..00000000000 --- a/ACE/apps/soreduce/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.soreduce.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS = soreduce - -soreduce_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -soreduce_SOURCES = \ - Library.cpp \ - Obj_Module.cpp \ - SO_Group.cpp \ - Sig_List.cpp \ - Signature.cpp \ - soreduce.cpp \ - Library.h \ - Obj_Module.h \ - SO_Group.h \ - Sig_List.h \ - Signature.h - -soreduce_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/soreduce/README b/ACE/apps/soreduce/README index 5e0264bdab2..5c89ac234a8 100644 --- a/ACE/apps/soreduce/README +++ b/ACE/apps/soreduce/README @@ -1,9 +1,11 @@ +$Id$ + Shared Library Reduction Tool ----------------------------- The motivation for this tool was the understanding that the ACE & TAO libraries were to be linked with the VxWorks kernel to allow multiple -applications to be run simultaniously with a minimum of footprint +applications to be run simultaneously with a minimum of footprint consumed. Ordinarily a choice is made between static linking applications, where each application gets only the object modules needed, and shared object linkage, where multiple applications share @@ -30,7 +32,7 @@ the following steps to generate its results. important that target library directory has a current .shobj subdirectory. -3. The list of undefined symbols is traversed. For each entry in the list, the +3. The list of undefined symbols is traversed. For each entry in the list, the modules loaded from step 2 are examined to look for a matching symbol. When one is found, the target symbol, and any others satisfied by the module are removed from the list, and any @@ -44,7 +46,7 @@ the following steps to generate its results. Analysis Artifacts ------------------ - + Development of the shared library reduction tool also provided a secondary benefit. It is able to output usage metrics for the various modules, which may be useful for directing further hand-crafted @@ -102,7 +104,7 @@ already fairly well factored so that the additional subsetting by soreduce is not effective. Also, due to the layout of the orbsvcs library source directory, the tool may not generate valid mpc files. -bash$ $ACE_ROOT/apps/soreduce/soreduce Naming_Service/Naming_Service tests/Simple_Naming/client +bash$ $ACE_ROOT/apps/soreduce/soreduce Naming_Service/Naming_Service tests/Simple_Naming/client discovering libraries loading object modules Libs subject to analysis: diff --git a/ACE/bin/ChangeLogEditor/CVSFileLocator.pm b/ACE/bin/ChangeLogEditor/CVSFileLocator.pm index 8e478509f01..700364c7626 100644 --- a/ACE/bin/ChangeLogEditor/CVSFileLocator.pm +++ b/ACE/bin/ChangeLogEditor/CVSFileLocator.pm @@ -4,6 +4,7 @@ package CVSFileLocator; # Description : Use CVS to determine the list of modified files. # Author : Chad Elliott # Create Date : 11/29/2005 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/ChangeLogEditor/ChangeLogEdit.pm b/ACE/bin/ChangeLogEditor/ChangeLogEdit.pm index 1bbfee507b1..fba1fa9bebe 100644 --- a/ACE/bin/ChangeLogEditor/ChangeLogEdit.pm +++ b/ACE/bin/ChangeLogEditor/ChangeLogEdit.pm @@ -4,6 +4,7 @@ package ChangeLogEdit; # Description : Edit the existing ChangeLog. # Author : Chad Elliott # Create Date : 9/10/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/ChangeLogEditor/ChangeLogEntry.pm b/ACE/bin/ChangeLogEditor/ChangeLogEntry.pm index 1fdcf9d3da3..d45967f9345 100644 --- a/ACE/bin/ChangeLogEditor/ChangeLogEntry.pm +++ b/ACE/bin/ChangeLogEditor/ChangeLogEntry.pm @@ -4,6 +4,7 @@ package ChangeLogEntry; # Description : Create a ChangeLog entry based on modified files. # Author : Chad Elliott # Create Date : 6/18/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/ChangeLogEditor/EmailTranslator.pm b/ACE/bin/ChangeLogEditor/EmailTranslator.pm index eacbff22497..53ebf8a3b0f 100644 --- a/ACE/bin/ChangeLogEditor/EmailTranslator.pm +++ b/ACE/bin/ChangeLogEditor/EmailTranslator.pm @@ -5,6 +5,7 @@ package EmailTranslator; # an email address. # Author : Chad Elliott # Create Date : 6/18/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/ChangeLogEditor/FileLocator.pm b/ACE/bin/ChangeLogEditor/FileLocator.pm index 5707a84c345..b04f9a49eb2 100644 --- a/ACE/bin/ChangeLogEditor/FileLocator.pm +++ b/ACE/bin/ChangeLogEditor/FileLocator.pm @@ -4,6 +4,7 @@ package FileLocator; # Description : Base class for file locators. # Author : Chad Elliott # Create Date : 6/18/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm b/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm index b7a2320788a..9fd292cc603 100644 --- a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm +++ b/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm @@ -4,6 +4,7 @@ package FileLocatorFactory; # Description : Create FileLocator objects. # Author : Chad Elliott # Create Date : 11/29/2005 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/ChangeLogEditor/SVNFileLocator.pm b/ACE/bin/ChangeLogEditor/SVNFileLocator.pm index 55a8674af81..87d3910a333 100644 --- a/ACE/bin/ChangeLogEditor/SVNFileLocator.pm +++ b/ACE/bin/ChangeLogEditor/SVNFileLocator.pm @@ -4,6 +4,7 @@ package SVNFileLocator; # Description : Use SVN to determine the list of modified files. # Author : Chad Elliott # Create Date : 11/29/2005 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/DependencyGenerator/GNUDependencyWriter.pm b/ACE/bin/DependencyGenerator/GNUDependencyWriter.pm index dd59ce6b803..3d6915212b9 100644 --- a/ACE/bin/DependencyGenerator/GNUDependencyWriter.pm +++ b/ACE/bin/DependencyGenerator/GNUDependencyWriter.pm @@ -4,6 +4,7 @@ package GNUDependencyWriter; # Description : Generates GNU Makefile dependencies. # Author : Chad Elliott # Create Date : 2/10/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/DependencyGenerator/GNUObjectGenerator.pm b/ACE/bin/DependencyGenerator/GNUObjectGenerator.pm index a7bd2842c9c..648fa9c5e9c 100644 --- a/ACE/bin/DependencyGenerator/GNUObjectGenerator.pm +++ b/ACE/bin/DependencyGenerator/GNUObjectGenerator.pm @@ -4,6 +4,7 @@ package GNUObjectGenerator; # Description : Generates object files for GNU Makefiles. # Author : Chad Elliott # Create Date : 5/23/2003 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/FOCUS/README b/ACE/bin/FOCUS/README index 871299833f6..7fd7059b9e6 100644 --- a/ACE/bin/FOCUS/README +++ b/ACE/bin/FOCUS/README @@ -1,4 +1,4 @@ - +$Id$ FOCUS README ============ diff --git a/ACE/bin/FOCUS/specializations/README b/ACE/bin/FOCUS/specializations/README index e2126bf6566..969e4e885f9 100644 --- a/ACE/bin/FOCUS/specializations/README +++ b/ACE/bin/FOCUS/specializations/README @@ -1,3 +1,5 @@ +$Id$ + @file README ============ diff --git a/ACE/bin/LabVIEW_RT/README b/ACE/bin/LabVIEW_RT/README index f79c607704e..a09c639d656 100644 --- a/ACE/bin/LabVIEW_RT/README +++ b/ACE/bin/LabVIEW_RT/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This directory contains utilities for running the ACE+TAO test suite on a LabVIEW RT 8 / Phar Lap ETS target. Although it's running Phar Lap ETS, diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt b/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt index a4b1b5379b3..65f3ddab9f2 100644 --- a/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt +++ b/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt @@ -1,3 +1,5 @@ +$Id$ + ======================================================================== DYNAMIC LINK LIBRARY : labview_test_controller Project Overview ======================================================================== diff --git a/ACE/bin/MakeProjectCreator/README b/ACE/bin/MakeProjectCreator/README index 09b450805e7..477fec48337 100644 --- a/ACE/bin/MakeProjectCreator/README +++ b/ACE/bin/MakeProjectCreator/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains ACE- and TAO-specific extensions of MPC. All the base projects in the config directory are ACE- and TAO-specific, along with the perl modules for the gnuace and vxtest types and the diff --git a/ACE/bin/MakeProjectCreator/config/automake.features b/ACE/bin/MakeProjectCreator/config/automake.features deleted file mode 100644 index 4a9957a1d2f..00000000000 --- a/ACE/bin/MakeProjectCreator/config/automake.features +++ /dev/null @@ -1,39 +0,0 @@ -// $Id$ - -// Ideally this file should enable all features, and the configure script -// would enable or disable the corresponding automake conditionals. More -// work is required to make this a reality. - -automake=1 -ssl=1 -qos=0 - -gl=1 -x11=1 -athena=1 -motif=1 - -fl=1 -ace_flreactor=1 -tao_flresource=1 - -qt=1 -ace_qtreactor=1 -tao_qtresource=1 - -tk=1 -ace_tkreactor=1 -tao_tkresource=1 - -xt=1 -ace_xtreactor=1 -tao_xtresource=1 - -wxWindows=1 - -stl=1 -bzip2=1 -boost=1 -java=1 -zlib=1 -zzip=1 diff --git a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb index d755f480cac..225b6a19cde 100644 --- a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb +++ b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb @@ -13,7 +13,7 @@ project { } verbatim(gnuace, circuit) { ifneq ($(CROSS-COMPILE),) - all clean realclean idl_stubs depend lib_warning require_warning avoid_warning: + all clean realclean idl_stubs depend lib_warning require_warning avoid_warning install: " @echo This project will not build on CROSS-COMPILE platforms." else } diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index 74b7625098e..e30673e6bc7 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -70,6 +70,7 @@ dds4ccm_opendds = 0 dds4ccm_ndds = 0 dds4ccm_splice = 0 dds4ccm_coredx = 0 +openmp = 0 // Features for various GUI libraries @@ -152,5 +153,7 @@ link_codecfactory = 0 ccm_lw = 1 // Feature for CCM for disabling events. ccm_noevent = 0 +// Feature for direct collocation +ccm_direct_collocation = 0 valuetype_out_indirection=1 diff --git a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt index cbac98abf70..a8150f336bc 100644 --- a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt +++ b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt @@ -1,3 +1,4 @@ +// $Id$ // Current as of 2/27/2007 // This defines the role of all the template variables specific to the // 'gnuace' project type. diff --git a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm b/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm deleted file mode 100644 index e43dbe9418e..00000000000 --- a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm +++ /dev/null @@ -1,212 +0,0 @@ -package AutomakeWorkspaceHelper; - -# ************************************************************ -# Description : An Automake Workspace Helper -# Author : Chad Elliott -# Create Date : 9/01/2004 -# ************************************************************ - -# ************************************************************ -# Pragmas -# ************************************************************ - -use strict; -use FileHandle; -use File::Basename; - -use WorkspaceHelper; - -use vars qw(@ISA); -@ISA = qw(WorkspaceHelper); - -# ************************************************************ -# Data Section -# ************************************************************ - -my(%vals) = ('ACE_ROOT' => '$(top_srcdir)', - 'TAO_ROOT' => '$(top_srcdir)', - 'CIAO_ROOT' => '$(top_srcdir)', - 'ACE_BUILDDIR' => '$(top_builddir)', - 'TAO_BUILDDIR' => '$(top_builddir)', - 'CIAO_BUILDDIR' => '$(top_builddir)', - 'TAO_IDL' => 'ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl' . "\n" . - 'TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl' . "\n" . - 'TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf', - ); - -my(%addon) = ('ACE_ROOT' => {'CIAO_ROOT' => '/../..', - 'TAO_ROOT' => '/..', - 'CIAO_BUILDDIR' => '/../..', - 'TAO_BUILDDIR' => '/..'}, - 'ACE_BUILDDIR' => {'CIAO_ROOT' => '/../..', - 'TAO_ROOT' => '/..', - 'CIAO_BUILDDIR' => '/../..', - 'TAO_BUILDDIR' => '/..'}, - 'TAO_ROOT' => {'CIAO_ROOT' => '/..', - 'CIAO_BUILDDIR' => '/..'}, - 'TAO_BUILDDIR' => {'CIAO_ROOT' => '/..', - 'CIAO_BUILDDIR' => '/..'}, - ); - -## These are required when processing the TAO workspace -my(%libdirs) = ('libACE_SSL.la' => 'ace/SSL', - 'libACEXML.la' => 'ACEXML/common', - 'libACEXML_Parser.la' => 'ACEXML/parser/parser', - 'libACE_TMCast.la' => 'protocols/ace/TMCast', - 'libACE_RMCast.la' => 'protocols/ace/RMCast', - 'libACE_HTBP.la' => 'protocols/ace/HTBP', - 'libACE_ETCL.la' => 'ace/ETCL', - 'libACE_ETCL_Parser.la' => 'ace/ETCL', - 'libACE_Monitor_Control.la' => 'ace/Monitor_Control', - 'libKokyu.la' => 'Kokyu', - ); - -# ************************************************************ -# Subroutine Section -# ************************************************************ - -sub modify_value { - my($self) = shift; - my($name) = shift; - my($value) = shift; - - if ($name eq 'includedir') { - ## TAO/orbsvcs and TAO are like separate projects, so first - ## remove the TAO/orbsvcs part and if that doesn't work try - ## removing the TAO part. The ACE related values don't need - ## any modification. - if (!($value =~ s/^\/orbsvcs\/orbsvcs$/\/orbsvcs/)) { - if (!($value =~ s/^\/TAO\/orbsvcs//)) { - if (!($value =~ s/^\/TAO//)) { - ## These ACE related libraries need fixing too. - $value =~ s/^\/protocols(\/ace)/$1/; - } - } - } - } - elsif ($name eq 'amflags') { - if (basename(Cwd::getcwd()) eq 'TAO') { - $value .= ' -I ../m4'; - } - } - elsif ($name eq 'extra') { - if (basename(Cwd::getcwd()) eq 'TAO') { - $value .= "EXTRA_DIST = \\\n" . - " PROBLEM-REPORT-FORM \\\n" . - " VERSION \\\n" . - " COPYING.sun \\\n" . - " LICENSE.sun \\\n" . - " README.sun\n\n" . - "release:\n" . - "\t\$(MAKE) dist\n\n". - "TAO_EXTRA_DIST = docs\n\n" . - "dist-hook:\n" . - "\t(cd \$(top_srcdir); tar cf - \$(TAO_EXTRA_DIST)) | (cd \$(distdir); \\\n" . - "\t tar xfBp -)\n" . - "\tlist=`find \$(distdir) -type d -name .svn -print`; for p in \$\$list; do \\\n" . - "\t rm -rf \$\$p; done\n"; - } - } - - return $value; -} - -sub modify_libpath { - my($self) = shift; - my($str) = shift; - my($reldir) = shift; - my($libname) = shift; - - if ($libname =~ /^lib(ace)/i) { - if (!defined $reldir || $reldir eq '') { - if (defined $libdirs{$libname}) { - $reldir = $libdirs{$libname}; - } - else { - $reldir = 'ace'; - } - } - $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!; - return $str; - } - elsif ($libname =~ /^lib(kokyu\.)/i) { - if (!defined $reldir || $reldir eq '') { - if (defined $libdirs{$libname}) { - $reldir = $libdirs{$libname}; - } - else { - $reldir = 'Kokyu'; - } - } - $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!; - return $str; - } - elsif ($libname =~ /^lib(tao|kokyu)/i) { - if (defined $reldir) { - $reldir =~ s!TAO/!!; - $str =~ s!$libname!\$(TAO_BUILDDIR)/$reldir/$libname!; - return $str; - } - } - elsif ($libname =~ /^libciao/i) { - if (defined $reldir) { - $reldir =~ s!TAO/CIAO/!!; - $str =~ s!$libname!\$(CIAO_BUILDDIR)/$reldir/$libname!; - return $str; - } - } - - return undef; -} - -sub write_settings { - my($self) = shift; - my($wsc) = shift; - my($fh) = shift; - my(@locals) = @_; - my($status) = 1; - my($error) = undef; - my($crlf) = $wsc->crlf(); - my($pfh) = new FileHandle(); - my(%seen) = (); - my($outdir) = $wsc->get_outdir(); - - foreach my $local (reverse @locals) { - if (open($pfh, "$outdir/$local")) { - while(<$pfh>) { - foreach my $key (keys %vals) { - if (/\$\($key\)/) { - $seen{$key} = $vals{$key}; - } - } - } - close($pfh); - } - else { - $status = 0; - $error = "Unable to open $local for reading."; - } - } - - foreach my $key (sort keys %seen) { - print $fh "$key = $seen{$key}"; - if (defined $addon{$key}) { - foreach my $add ( - sort { length($addon{$key}->{$b}) <=> - length($addon{$key}->{$a}) } keys %{$addon{$key}}) { - if ($seen{$add}) { - print $fh $addon{$key}->{$add}; - last; - } - } - } - print $fh $crlf; - } - - print $fh $crlf; - - return $status, $error; -} - - -1; diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm index 635cd48bb7d..fa43672242a 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm @@ -4,6 +4,7 @@ package GNUACEProjectCreator; # Description : A GNU Project Creator for ACE # Author : Chad Elliott # Create Date : 3/13/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm index 5f9e5e5d772..2e3da144315 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm @@ -4,6 +4,7 @@ package GNUACEWorkspaceCreator; # Description : A GNU Workspace (GNUmakefile) creator for ACE # Author : Chad Elliott # Create Date : 5/13/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildProjectCreator.pm index aa24f83075c..8268c97719a 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildProjectCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildProjectCreator.pm @@ -4,6 +4,7 @@ package GNUAutobuildProjectCreator; # Description : A Project creator for the GNUAutobuild project type # Author : Chad Elliott # Create Date : 3/13/2002 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm index 7f29c927088..91dd8523a82 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm @@ -6,6 +6,7 @@ package GNUAutobuildWorkspaceCreator; # before outputting to stdout. # Author : Chad Elliott, minor modifications by Will Otte # Create Date : 3/22/07 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm index 669fbf1b258..8948f7099b8 100644 --- a/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm @@ -4,6 +4,7 @@ package VXTestProjectCreator; # Description : A Project Creator for VxWorks testing # Author : Johnny Willemsen # Create Date : 3/27/2008 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm index 6421ae3858f..0f832dcd90e 100644 --- a/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm @@ -4,6 +4,7 @@ package VXTestWorkspaceCreator; # Description : VxTest Workspace create # Author : Johnny Willemsen # Create Date : 28/03/2008 +# $Id$ # ************************************************************ # ************************************************************ diff --git a/ACE/bin/Makefile.am b/ACE/bin/Makefile.am deleted file mode 100644 index 67c37859131..00000000000 --- a/ACE/bin/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## bin/mwc.pl -type automake -noreldefs -features ssl=1,qos=1 ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - PerlACE - -## Makefile.bin.am - -noinst_SCRIPTS = auto_run_tests.pl ace_tests.lst - -noinst_PROGRAMS = envinfo - -envinfo_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -envinfo_SOURCES = \ - envinfo.cpp - -envinfo_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/bin/PerlACE/Makefile.am b/ACE/bin/PerlACE/Makefile.am deleted file mode 100644 index d02bf527aa5..00000000000 --- a/ACE/bin/PerlACE/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu - - -## Makefile.PerlACE.am - -noinst_SCRIPTS = ConfigList.pm Process.pm Process_Unix.pm Process_Win32.pm Run_Test.pm - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/bin/PerlACE/README b/ACE/bin/PerlACE/README index ccc88d045db..02f51e797b3 100644 --- a/ACE/bin/PerlACE/README +++ b/ACE/bin/PerlACE/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ HOW TO USE THE DOC TEST FRAMEWORK --------------------------------- diff --git a/ACE/bin/add_rel_link.sh b/ACE/bin/add_rel_link.sh index 293058677f8..4ae65c1680e 100755 --- a/ACE/bin/add_rel_link.sh +++ b/ACE/bin/add_rel_link.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $Id$ # This script assumes it is being run by bash # ======= needed functions ====== diff --git a/ACE/bin/autoconf_compile b/ACE/bin/autoconf_compile deleted file mode 100755 index 8c3a283723d..00000000000 --- a/ACE/bin/autoconf_compile +++ /dev/null @@ -1,520 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- -# $Id$ -# -# This script checkouts ACE from CVS, configures ACE, and compiles -# `ace', `tests' and finally runs `tests/run_tests.sh'. -# -# If it detects any problem it sends e-mail. -# -# DO NOT invoke this script from your crontab, use -# autoconf_compile_wrapper for that. -# -# This script requires Perl 5. -# -# TODO: Modify the script or split it in such a way that the main copy -# can be obtained either using cvs or downloading the latest beta -# from the WWW. -# - -# The first three lines above let this script run without specifying the -# full path to perl, as long as it is in the user's PATH. -# Taken from perlrun man page. - -use File::Basename; -use FileHandle; -require POSIX; - -$directory_mode=0755; - -# This is the module we will checkout, someday someone could define a -# smaller module. -$MODULE='ACE_wrappers'; - -# These are the sub-directories (in the module) we really compile. - -# Find out the command name. -$CMD = basename($0); - -$single_threaded = 0; -$minimum_corba = 0; -$ami = 0; -$dont_update = 0; -$dont_run = 0; -$pre_clean = 0; -$post_clean = 0; -$report_success = 0; -$debug = 0; -@BUILD_LIST= (); - -@ARGS = (); -while ($#ARGV >= 0) { - if (!($ARGV[0] =~ m/-/)) { - push @ARGS, $ARGV[0]; - shift; - } elsif ($ARGV[0] eq "-single_threaded") { - $single_threaded = 1; - shift; - } elsif ($ARGV[0] eq "-minimum_corba") { - $minimum_corba = 1; - shift; - } elsif ($ARGV[0] eq "-ami") { - $ami =1; - shift; - } elsif ($ARGV[0] eq "-build_list") { - shift; - @BUILD_LIST = split (/,/, $ARGV[0]); - shift; - } elsif ($ARGV[0] eq "-dont_update") { - $dont_update = 1; - shift; - } elsif ($ARGV[0] eq "-dont_run") { - $dont_run = 1; - shift; - } elsif ($ARGV[0] eq "-pre_clean") { - $pre_clean = 1; - shift; - } elsif ($ARGV[0] eq "-post_clean") { - $post_clean = 1; - shift; - } elsif ($ARGV[0] eq "-report_success") { - $report_success = 1; - shift; - } elsif ($ARGV[0] eq "-debug") { - $debug = 1; - shift; - } -} - -# Extract configuration information from command line. - # TODO: Some validation and checking should be done here. -$CHECKOUT = $ARGS[0]; -$BUILD = $ARGS[1]; -$LOGDIR = $ARGS[2]; -$ADMIN = $ARGS[3]; -$MAIL = "mail"; -if ($#ARGS >= 4) { - $MAIL = $ARGS[4]; -} - -# We obtain our revision to report errors. -$REVISION='$Revision$ '; - -# When an error is found we try to die gracefully and send some email -# to ADMIN. - -$disable_file = $LOGDIR . '/.disable'; -$histfile = $LOGDIR . '/history'; -$LOGBASE = POSIX::strftime("%b%d_%Y.txt", localtime); -$LOGFILE = $LOGDIR . '/' . $LOGBASE; -$HOST = `hostname`; -chop $HOST; -$LOG_NAME = $HOST . "_" . $BUILD . "_" . $LOGBASE; -$STATUS = "OK"; - -if ($debug) { - print "CHECKOUT = $CHECKOUT\n"; - print "BUILD = $BUILD\n"; - print "LOGDIR = $LOGDIR\n"; - print "ADMIN = $ADMIN\n"; - print "MAIL = $MAIL\n"; -} - -push @INC, $CHECKOUT . '/' . $MODULE . '/bin'; -#require run_all_list; -@RUN_LIST = ('tests'); # Temporary hack - - -if ($#BUILD_LIST == -1) { - @BUILD_LIST= - ('ace', - 'netsvcs', - 'tests', - 'apps/gperf'); -} -if ($debug) { - - @BUILD_LIST = ('ace'); - @RUN_LIST = ('tests'); -# @SINGLE_THREADED_LIST = ('TAO/tests/OctetSeq'); -# @MINIMUM_CORBA_LIST = ('TAO/tests/OctetSeq'); - $ADMIN = $ENV{'LOGNAME'}; - -} - -sub mydie { - unlink $disable_file; - die $_ . "\n"; -} - -sub report_errors { - # First clear the lock, so the next execution works... - unlink $disable_file; # Ignore errors! - - # Now send a summary of the errors to the ADMIN account... - local $to = $ADMIN; - - open (MAIL, "|".$MAIL.' -s "[AUTO_COMPILE] '.$BUILD.'" '.$to) - || mydie "Cannot open mail pipe for: $_\n"; - - print MAIL 'The following message is brought to you by: ', "\n"; - print MAIL $CMD, ' [', $REVISION, "] for $BUILD on $CHECKOUT\n\n"; - - local $m; - foreach $m (@_) { - print MAIL $m, "\n"; - } - - print MAIL "\nPlease check the following log for more info:\n\n"; - print MAIL 'http://www.cs.wustl.edu/~bugzilla/auto_compile_logs/', - $LOG_NAME, "\n\n"; - - close (MAIL); # Ignore errors.... - - # Now send the complete log to bugzilla... - local $bugs = 'bugzilla'.'@cs.wustl.edu'; - open (MAIL, "|".$MAIL.' -s AUTO_COMPILE_LOG='.$LOG_NAME.' '.$bugs) - || mydie "Cannot open mail pipe for: $LOG_NAME\n"; - - print MAIL 'This is the log for: ', "\n"; - print MAIL $CMD, ' [', $REVISION, "] for $BUILD on $CHECKOUT\n"; - - print MAIL "\n================================================================\n"; - - if (open (THELOG, "$LOGFILE")) - { - while (<THELOG>) { - print MAIL $_; - } - close (THELOG); - } - close (MAIL); # Ignore errors.... -} - -### MAIN FUNCTION - -if (-f $disable_file) { - print 'The following message is brought to you by: ', "\n"; - print $CMD, ' [', $REVISION, "] for $BUILD on $CHECKOUT\n"; - - print "DISABLED\n"; - - exit 0; -} - -open (DISABLE, '>' . $disable_file) - || die "cannot open disable file"; -print DISABLE "autoconf_compile <$date> is running\n"; -close (DISABLE) - || die "cannot close disable file"; - -open(HIST, '>>' . $histfile) - # Do not use 'mydie' to report the problem, it tries to remove the - # disable file - || mydie "cannot open history file \"$histfile\"\n"; - -$date = localtime; - -print HIST $CMD, ': running at ', $date, ' '; - -open(LOG, '>' . $LOGFILE) - || mydie "cannot open log file"; - -LOG->autoflush (); - -# The following lines are useful when debugging the script or wrapper. -# print LOG $CHECKOUT, " ", $BUILD, " ", $LOGDIR, " ", $ADMIN, "\n"; -#while (($key,$value) = each %ENV) { -# print LOG $key, " = ", $value, "\n"; -#} - -chdir($CHECKOUT) - || mydie "Cannot chdir to $CHECKOUT"; - -if ($dont_update == 0) { - $date = localtime; - print LOG "$CMD: starting checkout at ", $date, "\n"; - open(CVS, "cvs -q checkout -P $MODULE 2>&1 |") - || mydie "cannot start checkout of $MODULE"; -# open(CVS, "cvsup -g -L 2 -P m ace-supfile 2>&1 |") -# || mydie "cannot start checkout"; - - $conflicts = 0; - while (<CVS>) { - if (m/^C /) { - $conflicts = 1; - } - print LOG $_; - } - close(CVS) - || mydie "error while checking out $MODULE"; - $date = localtime; - print LOG "$CMD: checkout finished at ", $date, "\n"; - - if ($conflicts != 0) { - mydie "conflicts on checkout"; - } -} - -chdir($MODULE) - || mydie "cannot chdir to $MODULE"; - -open (CHLOG, "ChangeLog") - || mydie "cannot open Changelog"; -$_ = <CHLOG>; -chop; -print LOG "ACE ChangeLogTag:", $_, "\n"; -close (CHLOG); - -open (CHLOG, "TAO/ChangeLog") - || mydie "cannot open TAO/Changelog"; -$_ = <CHLOG>; -chop; -print LOG "TAO ChangeLogTag:", $_, "\n"; -close (CHLOG); - -# Bootstrap the workspace -print LOG "$CMD: ==================================================\n\n"; -print LOG "$CMD: bootstrapping the workspace\n"; -open(BOOTSTRAP, "cd $CHECKOUT/ACE_wrappers && " - . "sh bin/bootstrap workspace --enable-deps 2>&1 |") - || mydie "cannot bootstrap workspace for $BUILD"; -while(<BOOTSTRAP>) { - print LOG $_; -} -close(BOOTSTRAP) - || mydie "error while bootstrapping the workspace"; -print LOG "$CMD: ==================================================\n\n"; - -# Begin the workspace configuration -$date = localtime; -print LOG "$CMD: starting configuration at ", $date, "\n"; - -# Check that we're in an ACE "top level" directory. -# We can actually build outside of the top level ACE directory, but -# let's do it this way for now. -(-d 'ace' && -d 'm4') || - die "$0: must be in top level ACE directory!\n"; - -# Create build directories, if needed. --d 'build' || mkdir ('build', $directory_mode); --d "$build" || mkdir ('build/' . "$BUILD", $directory_mode); - -# Now enter the build directory. -chdir('build/' . $BUILD) - || mydie "cannot chdir to $BUILD"; - -# Remove the configuration cache file to make sure a fresh -# configuration is created. -unlink "config.cache"; - -# Run the configuration script. -open(CONFIGURE, "sh $CHECKOUT/ACE_wrappers/configure 2>&1 |") - || mydie "cannot configure for $BUILD"; -while(<CONFIGURE>) { - print LOG $_; -} -close(CONFIGURE) - || mydie "error while configuring ACE"; -$date = localtime; -print LOG "$CMD: configure finished at ", $date, "\n"; - - -@failures = (); - -if ($pre_clean) { - foreach $i (@BUILD_LIST) { - $date = localtime; - print LOG "$CMD: =============================================\n"; - print LOG "$CMD: make clean in $i started at ", $date, "\n"; - open(MAKE, "make -k $MAKEFLAGS -C $i clean 2>&1 |") - || mydie "cannot start make in $i"; - - while (<MAKE>) { - # Ignore errors.... - } - if (close(MAKE) == 0) { - push @failures, "errors while cleaning $i"; - } - $date = localtime; - print LOG "$CMD: make clean in $i finished at ", $date, "\n"; - print LOG "$CMD: ==================================================\n\n"; - } -} - -$MAKEFLAGS .= ""; -foreach $i (@BUILD_LIST) { - $date = localtime; - print LOG "$CMD: =============================================\n"; - print LOG "$CMD: make for $i started at ", $date, "\n"; - open(MAKE, "make -k $MAKEFLAGS -C $i 2>&1 |") - || mydie "cannot start make for $i"; - - local $current_dir = $i; - local $last_error = ""; - while (<MAKE>) { - chop; - if ($^O eq 'hpux' - && m/^Warning:[ \t]+[0-9]+ future errors were detected/) { - next; - } - print LOG $_, "\n"; - - if (m/^make(\[[0-9]+\])?: Entering directory /) { - s/^make(\[[0-9]+\])?: Entering directory //; - $current_dir = $_; - } - if (m/error:/i || m/error /i - || m/^make(\[[0-9]+\])?: \*\*\*/) { - if ($last_error ne $current_dir - || STATUS eq "COMPILATION WARNING") { - $STATUS = "COMPILATION ERROR"; - push @failures, "Error while compiling in $current_dir \n"; - $last_error = $current_dir; - } - } - if (m/warning:/i || m/warning /i) { - if ($last_error ne $current_dir) { - if ($STATUS eq "OK") { - $STATUS = "COMPILATION WARNING"; - } - push @failures, "Warning while compiling in $current_dir\n"; - $last_error = $current_dir; - } - } - } - if (close(MAKE) == 0) { - push @failures, "errors while running make in $i"; - } - $date = localtime; - print LOG "$CMD: make for $i finished at ", $date, "\n"; - print LOG "$CMD: =============================================\n\n"; -} - -if ($dont_run == 0) { - @LIST = @RUN_LIST; - if ($single_threaded) { - @LIST = @SINGLE_THREADED_LIST; - } elsif ($minimum_corba) { - @LIST = @MINIMUM_CORBA_LIST; - } elsif ($ami) { - @LIST = @AMI_CORBA_LIST; - } - - foreach $i (@LIST) { - - $date = localtime; - print LOG "$CMD: ==================================================\n"; - print LOG "$CMD: running checks in $i at ", $date, "\n"; - local $subdir = - $CHECKOUT .'/'. $MODULE .'/build/'. $BUILD .'/'. $i; - chdir ($subdir) - || mydie "cannot chdir to $subdir"; - - $run_error = 0; - open(CHECK, "make -k $MAKEFLAGS -C $subdir check 2>&1 |"); - - local $current_dir = $i; - local $last_error = ""; - while (<CHECK>) { - chop; - if ($^O eq 'hpux' - && m/^Warning:[ \t]+[0-9]+ future errors were detected/) { - next; - } - print LOG $_, "\n"; - - if (m/^make(\[[0-9]+\])?: Entering directory /) { - s/^make(\[[0-9]+\])?: Entering directory //; - $current_dir = $_; - } - if (m/error:/i || m/error /i - || m/^make(\[[0-9]+\])?: \*\*\*/) { - if ($last_error ne $current_dir - || STATUS eq "COMPILATION WARNING") { - $STATUS = "COMPILATION ERROR"; - push @failures, "Error while compiling in $current_dir \n"; - $last_error = $current_dir; - } - } - if (m/warning:/i || m/warning /i) { - if ($last_error ne $current_dir) { - if ($STATUS eq "OK") { - $STATUS = "COMPILATION WARNING"; - } - push @failures, "Warning while compiling in $current_dir\n"; - $last_error = $current_dir; - } - } - if (m/Error/ - || m/ERROR/ - || m/FAILED/ - || m/failed/ - || m/FAIL/ - || m/EXCEPTION/ - || m/pure virtual /i) { - if ($STATUS eq "OK") { - $STATUS = "RUNTIME ERROR"; - } - $run_error = 1; - } - } - - if (close(CHECK) == 0) { - if ($STATUS eq "OK") { - $STATUS = "RUNTIME ERROR"; - } - push @failures, "Error when closing pipe in $i"; - next; - } - $date = localtime; - print LOG "$CMD: check finished ", $date, "\n"; - - if ($run_error != 0) { - push @failures, - "errors detected while making check in $i"; - } - } -} - -if ($post_clean) { - foreach $i (@BUILD_LIST) { - $date = localtime; - print LOG "$CMD: ==================================================\n"; - print LOG "$CMD: make clean in $i started at ", $date, "\n"; - open(MAKE, "make -k $MAKEFLAGS -C $i clean 2>&1 |"); - - while (<MAKE>) { - # Ignore errors.... - } - if (close(MAKE) == 0) { - push @failures, "errors while cleaning $i"; - } - $date = localtime; - print LOG "$CMD: make clean in $i finished at ", $date, "\n"; - print LOG "$CMD: ==================================================\n\n"; - } -} - -if ($#failures >= 0) { - report_errors @failures; -} - -close(LOG) - || mydie "cannot close LOGFILE"; - -print HIST "$STATUS\n"; -close(HIST) - || mydie "cannot close history file"; - -unlink $disable_file - || die "cannot unlink disable file"; - -if ($report_success && $STATUS eq "OK") { - report_errors "Congratulations: No errors or warnings detected\n"; -} - -exit 0; diff --git a/ACE/bin/autoconf_compile_wrapper b/ACE/bin/autoconf_compile_wrapper deleted file mode 100755 index 3ffddafb1a1..00000000000 --- a/ACE/bin/autoconf_compile_wrapper +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/sh -# -# $Id$ -# -# Usually cron setups a really miserable enviroment, this script -# serves two purposes: -# 1. Setup a good enviroment for auto_compile. -# 2. Invoke auto_compile with the proper arguments for each site. -# -# The idea is to modify this script on a per-site basis and leave -# auto_compile unmodified. -# - -# Setup a proper path, remember that cvs, make, perl5 and your -# compiler must be there. -PATH=.:$HOME/bin:/pkg/gnu/bin:/opt/SUNWspro/bin:$PATH -export PATH - -# Obvious enough. -CVSROOT=/project/cvs-repository -export CVSROOT - -# It could be a good idea to set CVSREAD this will make the staging -# area read-only, but our staging areas are public. -# CVSREAD=Y -# export CVSREAD - -# Here we define the cvs working copy for our staging area. -CHECKOUT=$HOME/head - -# In some sites the building directory differs from the cvs working -# copy. The directory is updated running -# $ACE_ROOT/bin/create_ace_build; but it must be setup manually the -# first time. -# TODO: Arrange for automatic creation of platform_macros.GNU & -# config.h. -BUILD=SUNCC - -# Here is where we store autoconf_compile output and keep a history of -# each run. -LOGDIR=$HOME/head/ACE_wrappers/build/$BUILD/autoconf_compile - -# Who do we send email when compilation (or anything else) fails. -ADMIN=PUT_YOUR_ADDRESS_HERE ; echo "You must edit this file" ; exit 0 - -# You must select a mail tool that can understand the -s option such -# as: -# -# /usr/bin/mailx Solaris -# /usr/bin/mailx HP-UX -# /usr/sbin/mailx IRIX -# /bin/mail Linux - -exec /pkg/gnu/bin/perl $CHECKOUT/ACE_wrappers/bin/autoconf_compile \ - $CHECKOUT $BUILD $LOGDIR $ADMIN /usr/bin/mailx - diff --git a/ACE/bin/bootstrap b/ACE/bin/bootstrap deleted file mode 100755 index 9b35e3e21da..00000000000 --- a/ACE/bin/bootstrap +++ /dev/null @@ -1,123 +0,0 @@ -#! /bin/sh - -# ------------------------------------------------------------------------- -# $Id$ -# -# Bootstrap ACE/TAO configuration tools when checked out from CVS. -# Requires GNU autoconf, GNU automake and GNU libtool. -# -# This script is only meant to be run by ACE/TAO maintainers. -# -# ------------------------------------------------------------------------- - -# Copyright (C) 1999, 2002 Ossama Othman -# -# All Rights Reserved -# -# This library is free software; you can redistribute it and/or -# modify it under the current ACE distribution terms. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - -set -e - -# If paginator environment variable isn't set then use `more'. -PAGER=${PAGER:-more} - -usage() -{ - cat <<EOF | $PAGER -Usage: bootstrap [OPTIONS] - -Generic options: - --help display this help and exit - -EOF - - exit $1 -} - - -if test $# -gt 2; then - usage 1 -fi - -while test $# -gt 0; do - case "$1" in - --help) - usage 0 - ;; - esac - shift -done - - -# This script must be run from the top-level ACE source directory -if test -d m4; then - - ## - # The beta is now cut on a linux box. These are available in /usr/bin. - # - # Set the PATH containing the GNU tools - #if (uname | grep SunOS > /dev/null 2>&1); then - # PATH=/project/danzon/pkg/gnu/bin:$PATH - # export PATH - #fi - - # Update the NEWS file - # For now just copy the contents of the `VERSION' file to make automake - # happy. Eventually, we should start putting real news in to it. - - autoupdate -f - -# autoreconf -I m4 --install --force --symlink --verbose - autoreconf -I m4 --install --force - -# # Generate the man pages. -# # Only generate man pages if bootstrapping a release. -# if test $bootstrap_release = yes; then -# if test -f man/man3/ACE.3; then -# echo ACE man pages have already been generated. -# else -# echo 'Generating the ACE man pages (this may take several minutes)' - -# (ACE_ROOT=.; \ -# export ACE_ROOT; \ -# ./bin/generate_doxygen.pl -is_release -exclude_tao > /dev/null) -# fi # test -f man/man3/ACE.3 -# fi # test $bootstrap_release = yes - -# # Regenerate the man pages lists in the man page Makefiles. - -# if test -f man/man3/Makefile.am; then -# # Only insert man page lists if bootstrapping a release. -# if test $bootstrap_release = yes; then -# echo 'Inserting ACE man page lists into appropriate Makefile.am files.' -# ACE_MAN_PAGES=`(cd man/man3 && echo *.3)` -# else -# ACE_MAN_PAGES= -# fi - -# (cd man/man3; \ -# eval "sed -e 's/^man_MANS =.*$/man_MANS = $ACE_MAN_PAGES/' \ -# Makefile.am > Makefile.am.new"; \ -# mv Makefile.am.new Makefile.am) -# (cd man/html; \ -# eval "sed -e 's/^html_DATA =.*$/html_DATA = $ACE_HTML_MAN_PAGES/' \ -# Makefile.am > Makefile.am.new"; \ -# mv Makefile.am.new Makefile.am) -# else -# test -f man/man3/Makefile.am || echo 'man/man3/Makefile.am is missing!' -# exit 1; -# fi # test -f man/man3/Makefile.am - - # Provide some more "useful" information. - echo "Done bootstrapping ACE autotool support." -else - echo "ACE autotool support must be bootstrapped from the" - echo "top-level ACE source directory." - exit 1; -fi # test -d m4 diff --git a/ACE/bin/clean_sems.sh b/ACE/bin/clean_sems.sh index b73793c7b62..7e9227d7a82 100755 --- a/ACE/bin/clean_sems.sh +++ b/ACE/bin/clean_sems.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $Id$ SYSTEM=`uname -s` IPCS="ipcs" diff --git a/ACE/bin/copy-script.sh b/ACE/bin/copy-script.sh index 2b893b584e9..68481c9e9d9 100755 --- a/ACE/bin/copy-script.sh +++ b/ACE/bin/copy-script.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $Id$ for i in *.gz *.bz2 *.zip *.md5; do d=`echo $i | sed 's/\.[tz][ai][rp]/-$1&/'` diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index 335034fae89..7db9fb35556 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -1,4 +1,7 @@ -if test -z $1; then olddate=2011_08_23; else olddate=$1; fi +#!/bin/sh +# $Id$ + +if test -z $1; then olddate=2011_10_10; else olddate=$1; fi if test -z $2; then newdate=`date -u +%Y_%m_%d`; else newdate=$2; fi if test -z $3; then prefix=`date -u +%Y%m%d%a`; else prefix=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index a7178223368..e8abaadfaf7 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -165,6 +165,12 @@ sub store_file ($) } push @files_conf, ($name); } + elsif ($name =~ /\.(conf.xml)$/i) { + if ($name =~ /\.(WCHAR_T.conf.xml|UTF-16.conf.xml)$/i) { + return; + } + push @files_conf, ($name); + } elsif ($name =~ /\.(pm|cmd|java|sh|txt|xml)$/i) { push @files_generic, ($name); } diff --git a/ACE/bin/generate_topinfo_charts.sh b/ACE/bin/generate_topinfo_charts.sh index 8924cfb110c..9baa2ca9ceb 100755 --- a/ACE/bin/generate_topinfo_charts.sh +++ b/ACE/bin/generate_topinfo_charts.sh @@ -1,7 +1,5 @@ #!/bin/sh -# # $Id$ -# gnuplot <<_EOF_ >/dev/null 2>&1 set xdata time diff --git a/ACE/bin/group_test_stats.sh b/ACE/bin/group_test_stats.sh index 4fe03f8128d..163de31c317 100755 --- a/ACE/bin/group_test_stats.sh +++ b/ACE/bin/group_test_stats.sh @@ -1,3 +1,6 @@ +#!/bin/sh +# $Id$ + if test -e tmp; then unlink tmp; fi if test -e tmp2; then unlink tmp2; fi cat t.txt | grep '+[a-z|A-Z]' > tmp diff --git a/ACE/bin/mail_test_stats.sh b/ACE/bin/mail_test_stats.sh index 4d295866649..0c094ac3f48 100755 --- a/ACE/bin/mail_test_stats.sh +++ b/ACE/bin/mail_test_stats.sh @@ -1,3 +1,6 @@ +#!/bin/sh +# $Id$ + export TREE_ROOT=$HOME/ACE/latest export ACE_ROOT=$TREE_ROOT/ACE_wrappers export TAO_ROOT=$ACE_ROOT/TAO diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index f7807d5e178..79d9843b978 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -914,16 +914,11 @@ def generate_workspaces (stage_dir): vc10_option = ' -name_modifier *_vc10 ' vc9_option = ' -name_modifier *_vc9 ' - vc8_option = ' -name_modifier *_vc8 ' redirect_option = str () if not opts.verbose: redirect_option = " >> ../mpc.log 2>&1" - # Generate GNUmakefiles - print "\tBootstrapping autotools support" - ex ("bin/bootstrap " + redirect_option) - print "\tGenerating GNUmakefiles...." ex (mpc_command + " -type gnuace " + exclude_option + mpc_option + redirect_option) @@ -933,9 +928,6 @@ def generate_workspaces (stage_dir): print "\tGenerating VC9 solutions..." ex (mpc_command + " -type vc9 " + mpc_option + vc9_option + redirect_option) - print "\tGenerating VC8 solutions..." - ex (mpc_command + " -type vc8 " + mpc_option + vc8_option + redirect_option) - print "\tCorrecting permissions for all generated files..." ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name '*.vcxproj' -or -name '*.filters' -or -name 'GNUmake*' | xargs chmod 0644") diff --git a/ACE/bin/mwc.pl b/ACE/bin/mwc.pl index 8e8a838eb29..171ca860954 100755 --- a/ACE/bin/mwc.pl +++ b/ACE/bin/mwc.pl @@ -34,7 +34,7 @@ my($mpcpath) = (defined $mpcroot ? $mpcroot : unshift(@INC, $mpcpath . '/modules'); if (defined $mpcroot) { - print STDERR "MPC_ROOT was set to $mpcroot.\n"; + print "MPC_ROOT was set to $mpcroot.\n"; } if (! -d "$mpcpath/modules") { diff --git a/ACE/bin/package_copy_script.sh b/ACE/bin/package_copy_script.sh index 2398d3d2908..b366196fc0e 100755 --- a/ACE/bin/package_copy_script.sh +++ b/ACE/bin/package_copy_script.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $Id$ for i in *.gz *.bz2 *.zip; do d=`echo $i | sed 's/\.[tz][ai][rp]/-5.5.10&/'` diff --git a/ACE/contrib/FaCE/License.txt b/ACE/contrib/FaCE/License.txt index 21719fba73b..c384fa56c90 100644 --- a/ACE/contrib/FaCE/License.txt +++ b/ACE/contrib/FaCE/License.txt @@ -1,5 +1,6 @@ == == Copyright and Licensing Information +== $Id$ == ACE(tm) and TAO(tm) are copyrighted by Dr. Douglas C. Schmidt and the Center for Distributed diff --git a/ACE/contrib/FaCE/README b/ACE/contrib/FaCE/README index a4bd2d981b1..c8a4713758c 100644 --- a/ACE/contrib/FaCE/README +++ b/ACE/contrib/FaCE/README @@ -1,3 +1,5 @@ +$Id$ + === === FaCE (Front-end for ACE CE) === diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc index 0075a4bf87a..21f178f3a81 100644 --- a/ACE/debian/ace.dsc +++ b/ACE/debian/ace.dsc @@ -1,10 +1,10 @@ Format: 1.0 -Source: ACE+TAO+CIAO-src-6.0.4 -Version: 2.0.4 +Source: ACE+TAO+CIAO-src-6.0.5 +Version: 2.0.5 Binary: ace Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> Architecture: any Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz Files: - 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.0.4.tar.gz + 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.0.5.tar.gz diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control index 2f7d45f0abb..ef2c535d2f6 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/debian.control @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-6.0.4 +Package: libace-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -45,7 +45,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-6.0.4 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.0.5 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, libtao-dev, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-6.0.4 +Package: libace-ssl-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -73,12 +73,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.0.4d), ${misc:Depends} +Depends: libace-ssl-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.0.5d), ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-6.0.4 +Package: libace-rmcast-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -92,12 +92,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-6.0.4 +Package: libace-tmcast-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -111,12 +111,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-6.0.4 +Package: libace-htbp-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-6.0.4 +Package: libace-inet-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -146,15 +146,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-6.0.4 +Package: libace-inet-ssl-6.0.5 Architecture: any Section: libs -Depends: libace-inet-6.0.3, libace-ssl-6.0.4, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.0.3, libace-ssl-6.0.5, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-6.0.4 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.0.5 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -188,7 +188,7 @@ Description: ACE perfect hash function generator (transitional package) . It can be safely removed after installation. -Package: libacexml-6.0.4 +Package: libacexml-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -204,16 +204,16 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libkokyu-6.0.4 +Package: libkokyu-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libtao-2.0.3, libtao-orbsvcs-2.0.4 +Suggests: libtao-2.0.3, libtao-orbsvcs-2.0.5 Description: ACE scheduling and dispatching library Kokyu is a library designed to provide flexible scheduling and dispatching services. @@ -224,12 +224,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-qtreactor-6.0.4 +Package: libace-qtreactor-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -248,12 +248,12 @@ Description: ACE-GUI reactor integration for Qt Package: libace-qtreactor-dev Architecture: any Section: libdevel -Depends: libace-qtreactor-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends} +Depends: libace-qtreactor-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends} Description: ACE-GUI reactor integration for Qt - development files This package contains header files and static library for the ACE-Qt reactor integration. -Package: libace-xtreactor-6.0.4 +Package: libace-xtreactor-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -271,12 +271,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.0.4), ${misc:Depends} +Depends: libace-xtreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.0.5), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-6.0.4 +Package: libace-tkreactor-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -295,12 +295,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-6.0.4 +Package: libace-flreactor-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -318,12 +318,12 @@ Description: ACE-GUI reactor integration for Fl Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.0.4), ${misc:Depends} +Depends: libace-flreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.0.5), ${misc:Depends} Description: ACE-GUI reactor integration for Fl - development files This package contains header files and static library for the ACE-Fl reactor integration. -Package: libace-foxreactor-6.0.4 +Package: libace-foxreactor-6.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -340,12 +340,12 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-6.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. -Package: libtao-2.0.4 +Package: libtao-2.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -360,7 +360,7 @@ Package: libtao-dev Architecture: any Section: libdevel Replaces: libtao-orbsvcs-dev (<< 5.7.7-4) -Depends: libtao-2.0.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-2.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Suggests: libtao-doc, libtao-orbsvcs-dev Description: ACE based CORBA ORB core libraries - development files This package contains the header files for TAO. Due to the size of @@ -376,7 +376,7 @@ Description: ACE based CORBA ORB core libraries - documentation This package contains the TAO overview documentation, tutorials, examples, and information regarding upstream development. -Package: libtao-orbsvcs-2.0.4 +Package: libtao-orbsvcs-2.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -387,14 +387,14 @@ Package: libtao-orbsvcs-dev Architecture: any Section: libdevel Replaces: libtao-dev (<< 5.7.7-4) -Depends: libtao-orbsvcs-2.0.4 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-orbsvcs-2.0.5 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO CORBA services - development files This package contains the header files for the TAO CORBA services. . The examples and some documentation have been included as well, but the static libraries have been left out due to their size (over 400MB). -Package: libtao-qtresource-2.0.4 +Package: libtao-qtresource-2.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -405,12 +405,12 @@ Description: TAO-GUI reactor integration for Qt Package: libtao-qtresource-dev Architecture: any Section: libdevel -Depends: libtao-qtresource-2.0.4 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-qtresource-2.0.5 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Qt - development files This package contains header files and static library for the TAO-Qt reactor integration. -Package: libtao-xtresource-2.0.4 +Package: libtao-xtresource-2.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -421,12 +421,12 @@ Description: TAO-GUI reactor integration for Xt Package: libtao-xtresource-dev Architecture: any Section: libdevel -Depends: libtao-xtresource-2.0.4 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-xtresource-2.0.5 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Xt - development files This package contains header files and static library for the TAO-Xt reactor integration. -Package: libtao-flresource-2.0.4 +Package: libtao-flresource-2.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -437,12 +437,12 @@ Description: TAO-GUI reactor integration for Fl Package: libtao-flresource-dev Architecture: any Section: libdevel -Depends: libtao-flresource-2.0.4 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-flresource-2.0.5 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Fl - development files This package contains header files and static library for the TAO-Fl reactor integration. -Package: libtao-tkresource-2.0.4 +Package: libtao-tkresource-2.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -453,12 +453,12 @@ Description: TAO-GUI reactor integration for Tk Package: libtao-tkresource-dev Architecture: any Section: libdevel -Depends: libtao-tkresource-2.0.4 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-tkresource-2.0.5 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Tk - development files This package contains header files and static library for the TAO-Tk reactor integration. -Package: libtao-foxresource-2.0.4 +Package: libtao-foxresource-2.0.5 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -469,14 +469,14 @@ Description: TAO-GUI reactor integration for FOX Package: libtao-foxresource-dev Architecture: any Section: libdevel -Depends: libtao-foxresource-2.0.4 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-foxresource-2.0.5 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for FOX - development files This package contains header files and static library for the TAO-FOX reactor integration. Package: tao-idl Architecture: any -Depends: g++, libtao-2.0.4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: g++, libtao-2.0.5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO IDL to C++ compiler This package provides an Interface Definition Language (IDL) to C++ compiler. @@ -486,7 +486,7 @@ Description: TAO IDL to C++ compiler Package: tao-ifr Architecture: any -Depends: g++, libtao-2.0.4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: g++, libtao-2.0.5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO interface repository CORBA-aware programs can contact an interface repository to get objects' interfaces at run-time. Then they can use the Dynamic diff --git a/ACE/debian/fix_doxygen.sh b/ACE/debian/fix_doxygen.sh index 8fe3951fc5a..590dc7dd8c8 100755 --- a/ACE/debian/fix_doxygen.sh +++ b/ACE/debian/fix_doxygen.sh @@ -1,7 +1,7 @@ #!/bin/sh -# +# $Id$ # This script regenerates changes on the Doxygen templates. -# + set -e export QUILT_PATCHES=debian/patches diff --git a/ACE/debian/libace-6.0.5.docs b/ACE/debian/libace-6.0.5.docs new file mode 100644 index 00000000000..3bdab5b0089 --- /dev/null +++ b/ACE/debian/libace-6.0.5.docs @@ -0,0 +1,8 @@ +README +VERSION +AUTHORS +docs/FAQ +PROBLEM-REPORT-FORM +THANKS +VERSION +NEWS diff --git a/ACE/debian/libace-6.0.4.install b/ACE/debian/libace-6.0.5.install index d9afda38c12..d9afda38c12 100644 --- a/ACE/debian/libace-6.0.4.install +++ b/ACE/debian/libace-6.0.5.install diff --git a/ACE/debian/libace-flreactor-6.0.5.install b/ACE/debian/libace-flreactor-6.0.5.install new file mode 100644 index 00000000000..528836aacee --- /dev/null +++ b/ACE/debian/libace-flreactor-6.0.5.install @@ -0,0 +1 @@ +usr/lib/libACE_FlReactor-*.so diff --git a/ACE/debian/libace-foxreactor-6.0.4.install b/ACE/debian/libace-foxreactor-6.0.5.install index e360f29f5af..e360f29f5af 100644 --- a/ACE/debian/libace-foxreactor-6.0.4.install +++ b/ACE/debian/libace-foxreactor-6.0.5.install diff --git a/ACE/debian/libace-htbp-6.0.4.install b/ACE/debian/libace-htbp-6.0.5.install index 08103fd5cad..08103fd5cad 100644 --- a/ACE/debian/libace-htbp-6.0.4.install +++ b/ACE/debian/libace-htbp-6.0.5.install diff --git a/ACE/debian/libace-inet-6.0.5.install b/ACE/debian/libace-inet-6.0.5.install new file mode 100644 index 00000000000..59a73a509d0 --- /dev/null +++ b/ACE/debian/libace-inet-6.0.5.install @@ -0,0 +1 @@ +usr/lib/libACE_INet-*.so diff --git a/ACE/debian/libace-inet-ssl-6.0.4.install b/ACE/debian/libace-inet-ssl-6.0.5.install index b9b8b9045f7..b9b8b9045f7 100644 --- a/ACE/debian/libace-inet-ssl-6.0.4.install +++ b/ACE/debian/libace-inet-ssl-6.0.5.install diff --git a/ACE/debian/libace-qtreactor-6.0.4.install b/ACE/debian/libace-qtreactor-6.0.5.install index 1d371e1e571..1d371e1e571 100644 --- a/ACE/debian/libace-qtreactor-6.0.4.install +++ b/ACE/debian/libace-qtreactor-6.0.5.install diff --git a/ACE/debian/libace-rmcast-6.0.4.install b/ACE/debian/libace-rmcast-6.0.5.install index 86e78259853..86e78259853 100644 --- a/ACE/debian/libace-rmcast-6.0.4.install +++ b/ACE/debian/libace-rmcast-6.0.5.install diff --git a/ACE/debian/libace-ssl-6.0.4.NEWS b/ACE/debian/libace-ssl-6.0.5.NEWS index e5bd0e4aa10..e5bd0e4aa10 100644 --- a/ACE/debian/libace-ssl-6.0.4.NEWS +++ b/ACE/debian/libace-ssl-6.0.5.NEWS diff --git a/ACE/debian/libace-ssl-6.0.5.install b/ACE/debian/libace-ssl-6.0.5.install new file mode 100644 index 00000000000..8df45a6d55f --- /dev/null +++ b/ACE/debian/libace-ssl-6.0.5.install @@ -0,0 +1 @@ +usr/lib/libACE_SSL-*.so diff --git a/ACE/debian/libace-tkreactor-6.0.5.install b/ACE/debian/libace-tkreactor-6.0.5.install new file mode 100644 index 00000000000..12ab35062d2 --- /dev/null +++ b/ACE/debian/libace-tkreactor-6.0.5.install @@ -0,0 +1 @@ +usr/lib/libACE_TkReactor-*.so diff --git a/ACE/debian/libace-tmcast-6.0.4.install b/ACE/debian/libace-tmcast-6.0.5.install index e066131dea0..e066131dea0 100644 --- a/ACE/debian/libace-tmcast-6.0.4.install +++ b/ACE/debian/libace-tmcast-6.0.5.install diff --git a/ACE/debian/libace-xtreactor-6.0.4.install b/ACE/debian/libace-xtreactor-6.0.5.install index c53614c7208..c53614c7208 100644 --- a/ACE/debian/libace-xtreactor-6.0.4.install +++ b/ACE/debian/libace-xtreactor-6.0.5.install diff --git a/ACE/debian/libacexml-6.0.4.docs b/ACE/debian/libacexml-6.0.5.docs index 002855d7915..002855d7915 100644 --- a/ACE/debian/libacexml-6.0.4.docs +++ b/ACE/debian/libacexml-6.0.5.docs diff --git a/ACE/debian/libacexml-6.0.5.install b/ACE/debian/libacexml-6.0.5.install new file mode 100644 index 00000000000..d3e912ffa51 --- /dev/null +++ b/ACE/debian/libacexml-6.0.5.install @@ -0,0 +1,3 @@ +usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so +usr/lib/libACEXML-*.so +usr/lib/libACEXML_Parser-*.so diff --git a/ACE/debian/libkokyu-6.0.5.docs b/ACE/debian/libkokyu-6.0.5.docs new file mode 100644 index 00000000000..e8869c513b2 --- /dev/null +++ b/ACE/debian/libkokyu-6.0.5.docs @@ -0,0 +1 @@ +Kokyu/README diff --git a/ACE/debian/libkokyu-6.0.5.install b/ACE/debian/libkokyu-6.0.5.install new file mode 100644 index 00000000000..62854308f96 --- /dev/null +++ b/ACE/debian/libkokyu-6.0.5.install @@ -0,0 +1 @@ +usr/lib/libKokyu-*.so diff --git a/ACE/debian/libtao-2.0.4.docs b/ACE/debian/libtao-2.0.5.docs index 6ed40bf21ea..6ed40bf21ea 100644 --- a/ACE/debian/libtao-2.0.4.docs +++ b/ACE/debian/libtao-2.0.5.docs diff --git a/ACE/debian/libtao-2.0.4.install b/ACE/debian/libtao-2.0.5.install index 65d040bd469..65d040bd469 100644 --- a/ACE/debian/libtao-2.0.4.install +++ b/ACE/debian/libtao-2.0.5.install diff --git a/ACE/debian/libtao-flresource-2.0.4.install b/ACE/debian/libtao-flresource-2.0.5.install index 5d4ee6ce57a..5d4ee6ce57a 100644 --- a/ACE/debian/libtao-flresource-2.0.4.install +++ b/ACE/debian/libtao-flresource-2.0.5.install diff --git a/ACE/debian/libtao-foxresource-2.0.5.install b/ACE/debian/libtao-foxresource-2.0.5.install new file mode 100644 index 00000000000..6ceb47601aa --- /dev/null +++ b/ACE/debian/libtao-foxresource-2.0.5.install @@ -0,0 +1 @@ +usr/lib/libTAO_FoxResource-*.so diff --git a/ACE/debian/libtao-orbsvcs-2.0.4.NEWS b/ACE/debian/libtao-orbsvcs-2.0.5.NEWS index ea0759e0ade..ea0759e0ade 100644 --- a/ACE/debian/libtao-orbsvcs-2.0.4.NEWS +++ b/ACE/debian/libtao-orbsvcs-2.0.5.NEWS diff --git a/ACE/debian/libtao-orbsvcs-2.0.4.install b/ACE/debian/libtao-orbsvcs-2.0.5.install index e0e491e9095..e0e491e9095 100644 --- a/ACE/debian/libtao-orbsvcs-2.0.4.install +++ b/ACE/debian/libtao-orbsvcs-2.0.5.install diff --git a/ACE/debian/libtao-qtresource-2.0.4.install b/ACE/debian/libtao-qtresource-2.0.5.install index 172f4c45db8..172f4c45db8 100644 --- a/ACE/debian/libtao-qtresource-2.0.4.install +++ b/ACE/debian/libtao-qtresource-2.0.5.install diff --git a/ACE/debian/libtao-tkresource-2.0.4.install b/ACE/debian/libtao-tkresource-2.0.5.install index 7f543154b5b..7f543154b5b 100644 --- a/ACE/debian/libtao-tkresource-2.0.4.install +++ b/ACE/debian/libtao-tkresource-2.0.5.install diff --git a/ACE/debian/libtao-xtresource-2.0.4.install b/ACE/debian/libtao-xtresource-2.0.5.install index ab5151ed073..ab5151ed073 100644 --- a/ACE/debian/libtao-xtresource-2.0.4.install +++ b/ACE/debian/libtao-xtresource-2.0.5.install diff --git a/ACE/docs/ACE-porting.html b/ACE/docs/ACE-porting.html index a1cc4ff34ce..ffc29459a4a 100644 --- a/ACE/docs/ACE-porting.html +++ b/ACE/docs/ACE-porting.html @@ -51,8 +51,7 @@ existent macros can be found in the <A HREF="../ace/README">$ACE_ROOT/ace/README</A> file. <P> Currently, you must edit this file by hand to port it to new OS -platforms, though on some platforms it's possible to use the ACE <A -HREF="../configure.ac">autoconf script</A>. It's a good idea to use +platforms. It's a good idea to use the <CODE>config-*.h</CODE> files for platforms with similar characteristics as examples. diff --git a/ACE/docs/CE-status.txt b/ACE/docs/CE-status.txt index cf2382fb27f..c718c398543 100644 --- a/ACE/docs/CE-status.txt +++ b/ACE/docs/CE-status.txt @@ -1,4 +1,6 @@ +$Id$ /** + @page wince ACE on Windows CE status Last updated Friday 14-November-2008 by Johnny Willemsen diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index 140fc06240c..581f8d45b2f 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -72,7 +72,7 @@ case. You may want to understand the DOC group's <A HREF="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/docs/ACE-bug-process.html?revision=HEAD"> bug fixing policies</A> when you make this decision. </P>The full packages do contain all sources with pre generated makefiles for GNU -make, Visual C++ 8.0/9.0/10.0, and GNU autoconf. The +make, Visual C++ 8.0/9.0/10.0. The sources-only packages just contain the source code, you have to generate your own makefiles with MPC. </P> <P> @@ -90,128 +90,128 @@ of the ACE, TAO, and CIAO micro release kit is available for <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> <TR><TD>ACE+TAO+CIAO.tar.gz</TD> <TD>ACE+TAO+CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+CIAO.tar.bz2</TD> <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+CIAO.zip</TD> <TD>ACE+TAO+CIAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.zip">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.gz</TD> <TD>ACE+TAO+DAnCE (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.bz2</TD> <TD>ACE+TAO+DAnCE (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.zip</TD> <TD>ACE+TAO+DAnCE (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.zip">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html.zip</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.zip">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.4.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.4.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.4.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.4.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.4.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.4.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.zip">FTP</A>] </TD> </TR> </TABLE> @@ -509,17 +509,22 @@ the links below to download it. <A HREF="http://www.dre.vanderbilt.edu/support.html">several companies</A>. <LI>RPMs for CentOS, Fedora, Mandriva, RHEL, SLE, and OpenSuSE are available from the <A HREF="http://software.opensuse.org/search">Open Build Service</A>. + <UL> + <LI>Latest micro release + <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro/</A> + <LI>Latest micro release with versioned namespaces + <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro:/versioned/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/micro:/versioned/</A> + <LI>Latest bug fix only release + <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/bugfixonly/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/bugfixonly/</A> + <LI>Latest minor release + <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor/</A> + <LI>Latest major release + <A HREF="http://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/">http://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/</A> + </UL> <LI> Ken Sedgwick's <A HREF="http://dist.bonsai.com/ken/ace_tao_rpm/">Fedora RPMs</A> for ACE and TAO. </UL><P> -The GNU autoconf support for ACE should work fine -"out-of-the-box.". -Naturally, if you run into problems with the use of autoconf in ACE -please submit a <A -HREF="http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/docs/ACE-bug-process.html">bug -report</A>. - <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index e2b60d22567..0c4518d8548 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -306,17 +306,13 @@ mkdir doxygen<br> cd doxygen<br> svn co - svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/ACE - ACE_wrappers<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/TAO - ACE_wrappers/TAO<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/CIAO - ACE_wrappers/TAO/CIAO<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/DAnCE - ACE_wrappers/TAO/DAnCE<br> + svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/ACE ACE_wrappers<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/TAO ACE_wrappers/TAO<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/CIAO ACE_wrappers/TAO/CIAO<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/DAnCE ACE_wrappers/TAO/DAnCE<br> cd ACE_wrappers<br> export ACE_ROOT=$PWD<br> - nohup $ACE_ROOT/bin/generate_rel_manpages &<br> + $ACE_ROOT/bin/generate_rel_manpages<br> scp ACE-html.tar.gz ACE-html.tar.bz2 ACE-html.zip ACE-html.tar.gz.md5 ACE-html.tar.bz2.md5 ACE-html.zip.md5 bczar@download.dre.vanderbilt.edu:/export/www/download.dre/ACE+TAO-distribution </code> <br> diff --git a/ACE/docs/msvc_notes.txt b/ACE/docs/msvc_notes.txt index aa3b6508773..6f251f8cc82 100644 --- a/ACE/docs/msvc_notes.txt +++ b/ACE/docs/msvc_notes.txt @@ -1,4 +1,6 @@ +$Id$ /** + @page msvc Miscellaneous Notes for ACE/TAO and Microsoft Visual C++ Here are just some random information about ACE/TAO with Microsoft Visual diff --git a/ACE/docs/wchar.txt b/ACE/docs/wchar.txt index cb502dd9110..ef13eaa2faf 100644 --- a/ACE/docs/wchar.txt +++ b/ACE/docs/wchar.txt @@ -1,3 +1,4 @@ +$Id$ /** @page wchar Wide Character/Unicode support in ACE diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 078899450ad..8d13ee5a25e 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -35,6 +35,7 @@ <hr> We do have the documentation for previous releases <ul> + <LI><P><A HREF="6.0.5/html">6.0.5</A></P></LI> <LI><P><A HREF="6.0.4/html">6.0.4</A></P></LI> <LI><P><A HREF="6.0.3/html">6.0.3</A></P></LI> <LI><P><A HREF="6.0.2/html">6.0.2</A></P></LI> diff --git a/ACE/examples/APG/Active_Objects/Makefile.am b/ACE/examples/APG/Active_Objects/Makefile.am deleted file mode 100644 index 0ef7451c6c1..00000000000 --- a/ACE/examples/APG/Active_Objects/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.AO.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += AO - -AO_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -AO_SOURCES = \ - AO.cpp - -AO_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.AO2.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += AO2 - -AO2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -AO2_SOURCES = \ - AO2.cpp - -AO2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Config/Makefile.am b/ACE/examples/APG/Config/Makefile.am deleted file mode 100644 index 5eb39fe51e0..00000000000 --- a/ACE/examples/APG/Config/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ARGV_Example.am - -noinst_PROGRAMS = ARGV_Example - -ARGV_Example_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ARGV_Example_SOURCES = \ - ARGV_Example.cpp \ - HASTATUS_export.h - -ARGV_Example_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Config_HA_Status.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += HA_Status - -HA_Status_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -HA_Status_SOURCES = \ - HA_Status.cpp \ - HASTATUS_export.h - -HA_Status_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Get_Opt.am - -noinst_PROGRAMS += Get_Opt - -Get_Opt_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Get_Opt_SOURCES = \ - Get_Opt.cpp \ - HASTATUS_export.h - -Get_Opt_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Get_Opt_Long.am - -noinst_PROGRAMS += Get_Opt_Long - -Get_Opt_Long_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Get_Opt_Long_SOURCES = \ - Get_Opt_Long.cpp \ - HASTATUS_export.h - -Get_Opt_Long_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Containers/Makefile.am b/ACE/examples/APG/Containers/Makefile.am deleted file mode 100644 index 4be38993e5a..00000000000 --- a/ACE/examples/APG/Containers/Makefile.am +++ /dev/null @@ -1,235 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Allocator.am - -noinst_PROGRAMS = Allocator - -Allocator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Allocator_SOURCES = \ - Allocator.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Allocator_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Array.am - -noinst_PROGRAMS += Array - -Array_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Array_SOURCES = \ - Array.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Array_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Containers_Hash_Map.am - -noinst_PROGRAMS += Hash_Map - -Hash_Map_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Hash_Map_SOURCES = \ - Hash_Map.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Hash_Map_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Containers_Map_Manager.am - -noinst_PROGRAMS += Map_Manager - -Map_Manager_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Map_Manager_SOURCES = \ - Map_Manager.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Map_Manager_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.DLList.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += DLList - -DLList_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -DLList_SOURCES = \ - DLList.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -DLList_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Hash_Map_Hash.am - -noinst_PROGRAMS += Hash_Map_Hash - -Hash_Map_Hash_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Hash_Map_Hash_SOURCES = \ - Hash_Map_Hash.cpp \ - Hash_Map_Hash.h - -Hash_Map_Hash_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Map_Manager_Specialization.am - -noinst_PROGRAMS += Map_Manager_Specialization - -Map_Manager_Specialization_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Map_Manager_Specialization_SOURCES = \ - Map_Manager_Specialization.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Map_Manager_Specialization_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Queues.am - -noinst_PROGRAMS += Queues - -Queues_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Queues_SOURCES = \ - Queues.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Queues_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.RB_Tree.am - -noinst_PROGRAMS += RB_Tree - -RB_Tree_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -RB_Tree_SOURCES = \ - RB_Tree.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -RB_Tree_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.RB_Tree_Functors.am - -noinst_PROGRAMS += RB_Tree_Functors - -RB_Tree_Functors_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -RB_Tree_Functors_SOURCES = \ - RB_Tree_Functors.cpp \ - RB_Tree_Functors.h - -RB_Tree_Functors_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sets.am - -noinst_PROGRAMS += Sets - -Sets_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Sets_SOURCES = \ - Sets.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Sets_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Stacks.am - -noinst_PROGRAMS += Stacks - -Stacks_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Stacks_SOURCES = \ - Stacks.cpp \ - DataElement.h \ - Hash_Map_Hash.h \ - KeyType.h \ - RB_Tree_Functors.h - -Stacks_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Logging/Makefile.am b/ACE/examples/APG/Logging/Makefile.am deleted file mode 100644 index 5a6f92b9fa6..00000000000 --- a/ACE/examples/APG/Logging/Makefile.am +++ /dev/null @@ -1,380 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Change_Instance_Default.am - -noinst_PROGRAMS = Change_Instance_Default - -Change_Instance_Default_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Change_Instance_Default_SOURCES = \ - Change_Instance_Default.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Change_Instance_Default_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Change_Mask.am - -noinst_PROGRAMS += Change_Mask - -Change_Mask_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Change_Mask_SOURCES = \ - Change_Mask.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Change_Mask_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Howto_Syslog.am - -noinst_PROGRAMS += Howto_Syslog - -Howto_Syslog_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Howto_Syslog_SOURCES = \ - Howto_Syslog.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Howto_Syslog_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Simple1.am - -noinst_PROGRAMS += Simple1 - -Simple1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Simple1_SOURCES = \ - Simple1.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Simple1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Simple2.am - -noinst_PROGRAMS += Simple2 - -Simple2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Simple2_SOURCES = \ - Simple2.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Simple2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Trace_Return.am - -noinst_PROGRAMS += Trace_Return - -Trace_Return_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Trace_Return_SOURCES = \ - Trace_Return.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Trace_Return_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Callback.am - -noinst_PROGRAMS += Use_Callback - -Use_Callback_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Callback_SOURCES = \ - Use_Callback.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Callback_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Callback2.am - -noinst_PROGRAMS += Use_Callback2 - -Use_Callback2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Callback2_SOURCES = \ - Use_Callback2.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Callback2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_LogManager.am - -noinst_PROGRAMS += Use_LogManager - -Use_LogManager_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_LogManager_SOURCES = \ - Use_LogManager.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_LogManager_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Logger.am - -noinst_PROGRAMS += Use_Logger - -Use_Logger_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Logger_SOURCES = \ - Use_Logger.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Logger_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Logging_Server.am - -noinst_PROGRAMS += Use_Logging_Server - -Use_Logging_Server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Logging_Server_SOURCES = \ - Use_Logging_Server.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Logging_Server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Logging_Strategy.am - -noinst_PROGRAMS += Use_Logging_Strategy - -Use_Logging_Strategy_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Logging_Strategy_SOURCES = \ - Use_Logging_Strategy.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Logging_Strategy_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Multiple_Sinks.am - -noinst_PROGRAMS += Use_Multiple_Sinks - -Use_Multiple_Sinks_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Multiple_Sinks_SOURCES = \ - Use_Multiple_Sinks.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Multiple_Sinks_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Ostream.am - -noinst_PROGRAMS += Use_Ostream - -Use_Ostream_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Ostream_SOURCES = \ - Use_Ostream.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Ostream_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Stderr.am - -noinst_PROGRAMS += Use_Stderr - -Use_Stderr_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Stderr_SOURCES = \ - Use_Stderr.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Stderr_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Use_Syslog.am - -noinst_PROGRAMS += Use_Syslog - -Use_Syslog_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Use_Syslog_SOURCES = \ - Use_Syslog.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Use_Syslog_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Wrap_Macros.am - -noinst_PROGRAMS += Wrap_Macros - -Wrap_Macros_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Wrap_Macros_SOURCES = \ - Wrap_Macros.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Wrap_Macros_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Wrap_Macros_Alt.am - -noinst_PROGRAMS += Wrap_Macros_Alt - -Wrap_Macros_Alt_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Wrap_Macros_Alt_SOURCES = \ - Wrap_Macros_Alt.cpp \ - Callback-2.h \ - Callback-3.h \ - Callback.h \ - LogManager.h \ - Log_Msg_Alt.h \ - Trace.h - -Wrap_Macros_Alt_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Makefile.am b/ACE/examples/APG/Makefile.am deleted file mode 100644 index 5a191de8a82..00000000000 --- a/ACE/examples/APG/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Active_Objects \ - Config \ - Containers \ - Logging \ - Misc_IPC \ - Naming \ - Proactor \ - Processes \ - Reactor \ - Shared_Memory \ - Signals \ - Sockets \ - Streams \ - Svc_Config \ - ThreadManagement \ - ThreadPools \ - ThreadSafety \ - Threads \ - Timers - diff --git a/ACE/examples/APG/Misc_IPC/Makefile.am b/ACE/examples/APG/Misc_IPC/Makefile.am deleted file mode 100644 index 7c9daa10038..00000000000 --- a/ACE/examples/APG/Misc_IPC/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.UDP_Broadcast.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += UDP_Broadcast - -UDP_Broadcast_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -UDP_Broadcast_SOURCES = \ - UDP_Broadcast.cpp - -UDP_Broadcast_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.UDP_Multicast.am - -noinst_PROGRAMS += UDP_Multicast - -UDP_Multicast_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -UDP_Multicast_SOURCES = \ - UDP_Multicast.cpp - -UDP_Multicast_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.UDP_Unicast.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += UDP_Unicast - -UDP_Unicast_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -UDP_Unicast_SOURCES = \ - UDP_Unicast.cpp - -UDP_Unicast_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Naming/Makefile.am b/ACE/examples/APG/Naming/Makefile.am deleted file mode 100644 index 29b98dd43d6..00000000000 --- a/ACE/examples/APG/Naming/Makefile.am +++ /dev/null @@ -1,128 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Netlocal.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Netlocal - -Netlocal_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Netlocal_SOURCES = \ - Netlocal.cpp \ - Temperature_Monitor2.cpp \ - Temperature_Monitor2.h - -Netlocal_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Netlocal_Reader.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Netlocal_reader - -Netlocal_reader_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Netlocal_reader_SOURCES = \ - Graph.cpp \ - Netlocal_reader.cpp \ - Temperature_Grapher.cpp \ - Graph.h \ - Temperature_Grapher.h - -Netlocal_reader_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Nodelocal.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Nodelocal - -Nodelocal_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Nodelocal_SOURCES = \ - Nodelocal.cpp \ - Temperature_Monitor.cpp \ - Temperature_Monitor.h - -Nodelocal_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Nodelocal_Shared.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Nodelocal_shared - -Nodelocal_shared_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Nodelocal_shared_SOURCES = \ - Nodelocal_shared.cpp \ - Temperature_Monitor2.cpp \ - Temperature_Monitor2.h - -Nodelocal_shared_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Nodelocal_Shared_Reader.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Nodelocal_shared_reader - -Nodelocal_shared_reader_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Nodelocal_shared_reader_SOURCES = \ - Graph.cpp \ - Nodelocal_shared_reader.cpp \ - Temperature_Grapher.cpp \ - Temperature_Monitor.cpp \ - Graph.h \ - Temperature_Grapher.h \ - Temperature_Monitor.h - -Nodelocal_shared_reader_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Proactor/Makefile.am b/ACE/examples/APG/Proactor/Makefile.am deleted file mode 100644 index 9d23599bcd0..00000000000 --- a/ACE/examples/APG/Proactor/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.HA_Proactive_Status.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = HA_Proactive_Status - -HA_Proactive_Status_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -HA_Proactive_Status_SOURCES = \ - HA_Proactive_Status.cpp \ - HA_Proactive_Status.h - -HA_Proactive_Status_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Processes/Makefile.am b/ACE/examples/APG/Processes/Makefile.am deleted file mode 100644 index ea828036b0f..00000000000 --- a/ACE/examples/APG/Processes/Makefile.am +++ /dev/null @@ -1,94 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Process_Manager_Death.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Process_Manager_Death - -Process_Manager_Death_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Manager_Death_SOURCES = \ - Process_Manager_Death.cpp - -Process_Manager_Death_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Process_Manager_Spawn.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Process_Manager_Spawn - -Process_Manager_Spawn_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Manager_Spawn_SOURCES = \ - Process_Manager_Spawn.cpp - -Process_Manager_Spawn_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Process_Mutex.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Process_Mutex - -Process_Mutex_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Mutex_SOURCES = \ - Process_Mutex.cpp - -Process_Mutex_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Spawn.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Spawn - -Spawn_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Spawn_SOURCES = \ - Spawn.cpp - -Spawn_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Reactor/Makefile.am b/ACE/examples/APG/Reactor/Makefile.am deleted file mode 100644 index 9e7d494af62..00000000000 --- a/ACE/examples/APG/Reactor/Makefile.am +++ /dev/null @@ -1,147 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Client.am - -noinst_PROGRAMS = Client - -Client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Client_SOURCES = \ - Client.cpp \ - Client.h - -Client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.HAStatus.am - -noinst_PROGRAMS += HAStatus - -HAStatus_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -HAStatus_SOURCES = \ - HAStatus.cpp \ - Client.h \ - ClientService.h - -HAStatus_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.HAStatus_AC.am - -noinst_PROGRAMS += HAStatus-AC - -HAStatus_AC_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -HAStatus_AC_SOURCES = \ - HAStatus-AC.cpp \ - Client.h \ - ClientService.h - -HAStatus_AC_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Timers.am - -noinst_PROGRAMS += Timers - -Timers_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timers_SOURCES = \ - Timers.cpp \ - Client.h \ - ClientService.h - -Timers_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reschedule.am - -noinst_PROGRAMS += Reschedule - -Reschedule_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reschedule_SOURCES = \ - Reschedule.cpp \ - Client.h \ - ClientService.h - -Reschedule_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Schedule_Timers.am - -noinst_PROGRAMS += Schedule_Timers - -Schedule_Timers_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Schedule_Timers_SOURCES = \ - Schedule_Timers.cpp \ - Client.h \ - ClientService.h - -Schedule_Timers_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timer_Cancel.am - -noinst_PROGRAMS += Timer_Cancel - -Timer_Cancel_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timer_Cancel_SOURCES = \ - Timer_Cancel.cpp \ - Client.h \ - ClientService.h - -Timer_Cancel_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timer_State_Data.am - -noinst_PROGRAMS += Timer_State_Data - -Timer_State_Data_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timer_State_Data_SOURCES = \ - Timer_State_Data.cpp \ - Client.h \ - ClientService.h - -Timer_State_Data_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Shared_Memory/Makefile.am b/ACE/examples/APG/Shared_Memory/Makefile.am deleted file mode 100644 index f5e7623d13b..00000000000 --- a/ACE/examples/APG/Shared_Memory/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Malloc.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Malloc - -Malloc_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Malloc_SOURCES = \ - Malloc.cpp \ - Record.h - -Malloc_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Mem_Map.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Mem_Map - -Mem_Map_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Mem_Map_SOURCES = \ - Mem_Map.cpp \ - Record.h - -Mem_Map_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.PI_Malloc.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += PI_Malloc - -PI_Malloc_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -PI_Malloc_SOURCES = \ - PI_Malloc.cpp \ - Record.h - -PI_Malloc_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Pool_Growth.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Pool_Growth - -Pool_Growth_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Pool_Growth_SOURCES = \ - Pool_Growth.cpp \ - Record.h - -Pool_Growth_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Shared_Memory_Hash_Map.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Hash_Map - -Hash_Map_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Hash_Map_SOURCES = \ - Hash_Map.cpp \ - Record.h - -Hash_Map_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Signals/Makefile.am b/ACE/examples/APG/Signals/Makefile.am deleted file mode 100644 index 6106f743c45..00000000000 --- a/ACE/examples/APG/Signals/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.SigAction.am - -noinst_PROGRAMS = SigAction - -SigAction_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SigAction_SOURCES = \ - SigAction.cpp - -SigAction_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SigGuard.am - -noinst_PROGRAMS += SigGuard - -SigGuard_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SigGuard_SOURCES = \ - SigGuard.cpp - -SigGuard_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SigHandler.am - -noinst_PROGRAMS += SigHandler - -SigHandler_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SigHandler_SOURCES = \ - SigHandler.cpp - -SigHandler_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SigHandlers.am - -noinst_PROGRAMS += SigHandlers - -SigHandlers_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SigHandlers_SOURCES = \ - SigHandlers.cpp - -SigHandlers_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SigInfo.am - -noinst_PROGRAMS += SigInfo - -SigInfo_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SigInfo_SOURCES = \ - SigInfo.cpp - -SigInfo_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Sockets/Makefile.am b/ACE/examples/APG/Sockets/Makefile.am deleted file mode 100644 index 99c4308137c..00000000000 --- a/ACE/examples/APG/Sockets/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Sockets_Basic.am - -noinst_PROGRAMS = Basic - -Basic_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Basic_SOURCES = \ - Basic.cpp - -Basic_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sockets_Basic_Robust.am - -noinst_PROGRAMS += Basic_Robust - -Basic_Robust_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Basic_Robust_SOURCES = \ - Basic_Robust.cpp - -Basic_Robust_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sockets_Iovec.am - -noinst_PROGRAMS += Iovec - -Iovec_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Iovec_SOURCES = \ - Iovec.cpp - -Iovec_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sockets_Server.am - -noinst_PROGRAMS += Server - -Server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Server_SOURCES = \ - Server.cpp - -Server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Streams/Makefile.am b/ACE/examples/APG/Streams/Makefile.am deleted file mode 100644 index c8992474495..00000000000 --- a/ACE/examples/APG/Streams/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Answerer.am - -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = Answerer - -Answerer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Answerer_SOURCES = \ - Answerer.cpp \ - CommandModule.cpp \ - CommandStream.cpp \ - CommandTask.cpp \ - CommandTasks.cpp \ - RecordingDeviceFactory.cpp \ - RecordingDevice_Text.cpp \ - CommandModule.h \ - CommandStream.h \ - CommandTask.h \ - CommandTasks.h \ - RecordingDeviceFactory.h \ - RecordingDevice_Text.h - -Answerer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Svc_Config/Makefile.am b/ACE/examples/APG/Svc_Config/Makefile.am deleted file mode 100644 index 4cde367f194..00000000000 --- a/ACE/examples/APG/Svc_Config/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.HA_Configurable_Server_Dynamic.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += HA_Configurable_Server_Dynamic - -HA_Configurable_Server_Dynamic_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -HA_Configurable_Server_Dynamic_SOURCES = \ - HA_Configurable_Server_Dynamic.cpp \ - HASTATUS_export.h \ - HA_Status_Dynamic.h \ - HA_Status_Static.h - -HA_Configurable_Server_Dynamic_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.HA_Configurable_Server_Static.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += HA_Configurable_Server_Static - -HA_Configurable_Server_Static_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -HA_Configurable_Server_Static_SOURCES = \ - HA_Configurable_Server_Static.cpp \ - HA_Status_Static.cpp \ - HA_Status_Static.h - -HA_Configurable_Server_Static_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Config_HA_Status.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libHA_Status.la - -libHA_Status_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DHASTATUS_BUILD_DLL - -libHA_Status_la_SOURCES = \ - HA_Status_Dynamic.cpp - -noinst_HEADERS = \ - HA_Status_Dynamic.h - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/ThreadManagement/Makefile.am b/ACE/examples/APG/ThreadManagement/Makefile.am deleted file mode 100644 index 6c555b3c86d..00000000000 --- a/ACE/examples/APG/ThreadManagement/Makefile.am +++ /dev/null @@ -1,155 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Async_Cancel.am - -noinst_PROGRAMS = Async_Cancel - -Async_Cancel_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Async_Cancel_SOURCES = \ - Async_Cancel.cpp \ - SecurityContext.h - -Async_Cancel_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Coop_Cancel.am - -noinst_PROGRAMS += Coop_Cancel - -Coop_Cancel_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Coop_Cancel_SOURCES = \ - Coop_Cancel.cpp \ - SecurityContext.h - -Coop_Cancel_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.ExitHandler.am - -noinst_PROGRAMS += ExitHandler - -ExitHandler_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ExitHandler_SOURCES = \ - ExitHandler.cpp \ - SecurityContext.h - -ExitHandler_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Pool.am - -noinst_PROGRAMS += Pool - -Pool_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Pool_SOURCES = \ - Pool.cpp \ - SecurityContext.h - -Pool_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Priorities.am - -noinst_PROGRAMS += Priorities - -Priorities_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Priorities_SOURCES = \ - Priorities.cpp \ - SecurityContext.h - -Priorities_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Signals.am - -noinst_PROGRAMS += Signals - -Signals_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Signals_SOURCES = \ - Signals.cpp \ - SecurityContext.h - -Signals_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Signals2.am - -noinst_PROGRAMS += Signals2 - -Signals2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Signals2_SOURCES = \ - Signals2.cpp \ - SecurityContext.h - -Signals2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Start_Hook.am - -noinst_PROGRAMS += Start_Hook - -Start_Hook_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Start_Hook_SOURCES = \ - Start_Hook.cpp \ - SecurityContext.h - -Start_Hook_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.State.am - -noinst_PROGRAMS += State - -State_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -State_SOURCES = \ - State.cpp \ - SecurityContext.h - -State_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/ThreadPools/Makefile.am b/ACE/examples/APG/ThreadPools/Makefile.am deleted file mode 100644 index f9e97f36719..00000000000 --- a/ACE/examples/APG/ThreadPools/Makefile.am +++ /dev/null @@ -1,101 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Futures.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Futures - -Futures_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Futures_SOURCES = \ - Futures.cpp \ - Request_Handler.h - -Futures_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.LF_ThreadPool.am - -noinst_PROGRAMS += LF_ThreadPool - -LF_ThreadPool_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -LF_ThreadPool_SOURCES = \ - LF_ThreadPool.cpp \ - Request_Handler.h - -LF_ThreadPool_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TP_Reactor.am - -noinst_PROGRAMS += TP_Reactor - -TP_Reactor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -TP_Reactor_SOURCES = \ - TP_Reactor.cpp \ - Request_Handler.h - -TP_Reactor_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Task_ThreadPool.am - -noinst_PROGRAMS += Task_ThreadPool - -Task_ThreadPool_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Task_ThreadPool_SOURCES = \ - Task_ThreadPool.cpp \ - Request_Handler.h - -Task_ThreadPool_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.ThreadPool.am - -noinst_PROGRAMS += ThreadPool - -ThreadPool_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ThreadPool_SOURCES = \ - ThreadPool.cpp \ - Request_Handler.h - -ThreadPool_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/ThreadSafety/Makefile.am b/ACE/examples/APG/ThreadSafety/Makefile.am deleted file mode 100644 index 35b216c41fc..00000000000 --- a/ACE/examples/APG/ThreadSafety/Makefile.am +++ /dev/null @@ -1,149 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Atomic_Op.am - -noinst_PROGRAMS = Atomic_Op - -Atomic_Op_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Atomic_Op_SOURCES = \ - Atomic_Op.cpp \ - ClientContext.h - -Atomic_Op_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Barrier.am - -noinst_PROGRAMS += Barrier - -Barrier_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Barrier_SOURCES = \ - Barrier.cpp \ - ClientContext.h - -Barrier_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Mutex.am - -noinst_PROGRAMS += Mutex - -Mutex_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Mutex_SOURCES = \ - Mutex.cpp \ - ClientContext.h - -Mutex_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.RW_Lock.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += RW_Lock - -RW_Lock_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -RW_Lock_SOURCES = \ - RW_Lock.cpp \ - ClientContext.h - -RW_Lock_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Semaphore.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Semaphore - -Semaphore_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Semaphore_SOURCES = \ - Semaphore.cpp \ - ClientContext.h - -Semaphore_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.TSS.am - -noinst_PROGRAMS += TSS - -TSS_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -TSS_SOURCES = \ - TSS.cpp \ - ClientContext.h - -TSS_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Tokens.am - -noinst_PROGRAMS += Tokens - -Tokens_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Tokens_SOURCES = \ - Tokens.cpp \ - ClientContext.h - -Tokens_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Tokens_Deadlock.am - -noinst_PROGRAMS += Tokens_Deadlock - -Tokens_Deadlock_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Tokens_Deadlock_SOURCES = \ - Tokens_Deadlock.cpp \ - ClientContext.h - -Tokens_Deadlock_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Threads/Makefile.am b/ACE/examples/APG/Threads/Makefile.am deleted file mode 100644 index c580c298dbd..00000000000 --- a/ACE/examples/APG/Threads/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Activate.am - -noinst_PROGRAMS = Activate - -Activate_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Activate_SOURCES = \ - Activate.cpp \ - Message_Receiver.h - -Activate_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Condition_Variables.am - -noinst_PROGRAMS += Condition_Variables - -Condition_Variables_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Condition_Variables_SOURCES = \ - Condition_Variables.cpp \ - Message_Receiver.h - -Condition_Variables_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Guards.am - -noinst_PROGRAMS += Guards - -Guards_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Guards_SOURCES = \ - Guards.cpp \ - Message_Receiver.h - -Guards_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Message_Blocks.am - -noinst_PROGRAMS += Message_Blocks - -Message_Blocks_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Message_Blocks_SOURCES = \ - Message_Blocks.cpp \ - Message_Receiver.h - -Message_Blocks_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Message_Queue.am - -noinst_PROGRAMS += Message_Queue - -Message_Queue_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Message_Queue_SOURCES = \ - Message_Queue.cpp \ - Message_Receiver.h - -Message_Queue_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Mutexes.am - -noinst_PROGRAMS += Mutexes - -Mutexes_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Mutexes_SOURCES = \ - Mutexes.cpp \ - Message_Receiver.h - -Mutexes_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/APG/Timers/Makefile.am b/ACE/examples/APG/Timers/Makefile.am deleted file mode 100644 index 9c09e5a22b8..00000000000 --- a/ACE/examples/APG/Timers/Makefile.am +++ /dev/null @@ -1,95 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Alarm.am - -noinst_PROGRAMS = Alarm - -Alarm_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Alarm_SOURCES = \ - Alarm.cpp \ - CB.h \ - PCB.h \ - PTimerDispatcher.h \ - TimerDispatcher.h \ - Upcall.h - -Alarm_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Task.am - -noinst_PROGRAMS += Task - -Task_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Task_SOURCES = \ - Task.cpp \ - CB.h \ - PCB.h \ - PTimerDispatcher.h \ - TimerDispatcher.h \ - Upcall.h - -Task_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timers.am - -noinst_PROGRAMS += Timers - -Timers_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timers_SOURCES = \ - CB.cpp \ - TimerDispatcher.cpp \ - Timers.cpp \ - CB.h \ - TimerDispatcher.h - -Timers_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Upcall.am - -noinst_PROGRAMS += Upcall - -Upcall_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Upcall_SOURCES = \ - PCB.cpp \ - PTimerDispatcher.cpp \ - Upcall.cpp \ - PCB.h \ - PTimerDispatcher.h \ - Upcall.h - -Upcall_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/ASX/CCM_App/Makefile.am b/ACE/examples/ASX/CCM_App/Makefile.am deleted file mode 100644 index 78ded02a046..00000000000 --- a/ACE/examples/ASX/CCM_App/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.ASX_CCM_App_Lib.am - -noinst_LTLIBRARIES = libccm_app.la - -libccm_app_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -libccm_app_la_SOURCES = \ - CCM_App.cpp - -## Makefile.ASX_CCM_App_Server.am - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_SOURCES = \ - SC_Server.cpp - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.ASX_CCM_App_Client.am - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - SC_Client.cpp - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/ASX/CCM_App/svc.conf.xml b/ACE/examples/ASX/CCM_App/svc.conf.xml index e743d4ed986..dd50ea1fa10 100644 --- a/ACE/examples/ASX/CCM_App/svc.conf.xml +++ b/ACE/examples/ASX/CCM_App/svc.conf.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> + <!-- --> + <!-- $Id$ --> + <!-- --> <static id="ACE_Service_Manager" params="-d -p 4911"/> <dynamic id="Test_Task" type="Service_Object"> <initializer path="CCM_App" init="_make_Test_Task" params="-p 3000"/> diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am deleted file mode 100644 index aefe1873d9d..00000000000 --- a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Event_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = Event_Server - -Event_Server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Event_Server_SOURCES = \ - Consumer_Router.cpp \ - Event_Analyzer.cpp \ - Options.cpp \ - Peer_Router.cpp \ - Supplier_Router.cpp \ - event_server.cpp \ - Consumer_Router.h \ - Event_Analyzer.h \ - Options.h \ - Options.inl \ - Peer_Router.h \ - Supplier_Router.h - -Event_Server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/ASX/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Makefile.am deleted file mode 100644 index f00f4c3dd09..00000000000 --- a/ACE/examples/ASX/Event_Server/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Event_Server \ - Transceiver - diff --git a/ACE/examples/ASX/Event_Server/README b/ACE/examples/ASX/Event_Server/README index 6038355a53e..2ed942618a3 100644 --- a/ACE/examples/ASX/Event_Server/README +++ b/ACE/examples/ASX/Event_Server/README @@ -1,3 +1,5 @@ +$Id$ + This subdirectory illustrates a number of the ACE ASX framework features using an ACE_Stream application called the Event Server. For more information on the design and use of the ACE ASX framework please @@ -22,7 +24,7 @@ The Event Server example works as follows: # Consumer % transceiver -p 10002 -h hostname -C - or + or # Supplier % transceiver -p 10003 -h hostname -S @@ -35,13 +37,13 @@ The Event Server example works as follows: Consumer(s) and Supplier(s) in different windows to make it easier to understand the output. -3. Once the Consumer(s) and Supplier(s) are connected, you can +3. Once the Consumer(s) and Supplier(s) are connected, you can type data from any Supplier window. This data will be routed through the Modules/Tasks in the event_server's Stream and be forwarded to the Consumer(s). Since the transceivers are full-duplex you can also send messages - from the Consumer(s) to Supplier(s). However, the Event Server will + from the Consumer(s) to Supplier(s). However, the Event Server will warn you about this since it's not really kosher to have Consumers sending to Suppliers... @@ -65,15 +67,15 @@ Some of the more interesting things to add would be: of the Event_Server based on messages it got from Suppliers (or Consumers). -3. Support for "pull" operations, as well as "push" operations. +3. Support for "pull" operations, as well as "push" operations. This would basically involve adding a "MIB Module" to get/set the "values" associated with "names" passed in by Peers. This could probably replace the Event_Analysis Module. 4. Filtering and correlation (this should probably be done - via a separate Module that handles filtering and correlation). + via a separate Module that handles filtering and correlation). -5. More flexible concurrency model(s), e.g., "Active Object per-Consumer". +5. More flexible concurrency model(s), e.g., "Active Object per-Consumer". This would enable the Event Server process to handle flow control more gracefully than it does not (it currently "hangs," which isn't desirable). diff --git a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am deleted file mode 100644 index f4ba3b5bf56..00000000000 --- a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Transceiver.am - -noinst_PROGRAMS = Transceiver - -Transceiver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Transceiver_SOURCES = \ - transceiver.cpp \ - transceiver.h - -Transceiver_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/ASX/Makefile.am b/ACE/examples/ASX/Makefile.am deleted file mode 100644 index 22df464dcfc..00000000000 --- a/ACE/examples/ASX/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - CCM_App \ - Event_Server \ - Message_Queue \ - UPIPE_Event_Server - diff --git a/ACE/examples/ASX/Message_Queue/Makefile.am b/ACE/examples/ASX/Message_Queue/Makefile.am deleted file mode 100644 index 3305b17bf1f..00000000000 --- a/ACE/examples/ASX/Message_Queue/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ASX_Message_Queue_Bounded_Buffer.am - -noinst_PROGRAMS = bounded_buffer - -bounded_buffer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -bounded_buffer_SOURCES = \ - bounded_buffer.cpp - -bounded_buffer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.ASX_Message_Queue_Buffer_Stream.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += buffer_stream - -buffer_stream_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -buffer_stream_SOURCES = \ - buffer_stream.cpp - -buffer_stream_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.ASX_Message_Queue_Priority_Buffer.am - -noinst_PROGRAMS += priority_buffer - -priority_buffer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -priority_buffer_SOURCES = \ - priority_buffer.cpp - -priority_buffer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am deleted file mode 100644 index f8ac89a7479..00000000000 --- a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.UPIPE_Event_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = UPIPE_Event_Server - -UPIPE_Event_Server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -UPIPE_Event_Server_SOURCES = \ - Consumer_Router.cpp \ - Event_Analyzer.cpp \ - Options.cpp \ - Peer_Router.cpp \ - Supplier_Router.cpp \ - event_server.cpp \ - Consumer_Router.h \ - Event_Analyzer.h \ - Options.h \ - Options.inl \ - Peer_Router.h \ - Supplier_Router.h - -UPIPE_Event_Server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Bounded_Packet_Relay/Makefile.am b/ACE/examples/Bounded_Packet_Relay/Makefile.am deleted file mode 100644 index 46e3ffc8ff4..00000000000 --- a/ACE/examples/Bounded_Packet_Relay/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Bounded_Packet_Relay.am - -noinst_PROGRAMS = bpr_thread - -bpr_thread_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_DEFERRED_TIMER_COMMANDS - -bpr_thread_SOURCES = \ - BPR_Drivers.cpp \ - Thread_Bounded_Packet_Relay.cpp \ - bpr_thread.cpp \ - BPR_Drivers.h \ - BPR_Drivers_T.h \ - Thread_Bounded_Packet_Relay.h - -bpr_thread_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Bounded_Packet_Relay/README b/ACE/examples/Bounded_Packet_Relay/README index 5757224c510..fb72f8731bd 100644 --- a/ACE/examples/Bounded_Packet_Relay/README +++ b/ACE/examples/Bounded_Packet_Relay/README @@ -1,3 +1,5 @@ +$Id$ + 1. INTRODUCTION This directory contains an example that illustrates how to use both @@ -5,9 +7,9 @@ threaded and reactive concurrency mechanisms in ACE. The example application schedules and processes heterogenerous user input and timer-based events in the context of a bounded packet relay mechanism. -In this example, a transmission begins, packets arrive from an input device +In this example, a transmission begins, packets arrive from an input device object, and are transferred to an output device object by a relay object at -a specified pace. The transfer continues until all packets have been +a specified pace. The transfer continues until all packets have been relayed, a duration limit expires, or the transmission is cancelled. User input is handled concurrently with a running transmission. You @@ -15,12 +17,12 @@ can run a transmission, cancel a transmission, change transmission parameters, view statistics from the most recent transmission, or exit the program, using selections from an interactive text-based menu. In addition, the example program can be run in batch mode, with the -appropriate commands piped to the program's standard input stream. +appropriate commands piped to the program's standard input stream. -Transmission parameters are intialized to default values. Transmission -parameter values persist until/unless they are subsequently modified by an +Transmission parameters are intialized to default values. Transmission +parameter values persist until/unless they are subsequently modified by an appropriate command. If an invalid value for a command is given, or a run -or report command is issued while a transmission is in progress, the +or report command is issued while a transmission is in progress, the offending command has no effect, and an error message is generated. 2. USER INTERFACE @@ -33,7 +35,7 @@ Settings commands: Minimum value is 1 packet, defaults to 1000 packets. - 2 <input packet arrival period (in usec)> + 2 <input packet arrival period (in usec)> Minimum value is 1 usec, defaults to 10000 usec (10 msec). @@ -50,7 +52,7 @@ Settings commands: to the output device). 5 <logging level> - + 0 - does no logging 1 - logs packets created by the input device 2 - logs packets consumed by the output device @@ -91,7 +93,7 @@ The relay object is passive, managing a message queue and necessary locks to allow safe access from multiple threads. It provides methods to receive and enqueue a mesage from the input device, dequeue a message and send it to the output device, and to start or end a -transmission. It uses ACE_Message_Queue (which contains ACE_Message_Block +transmission. It uses ACE_Message_Queue (which contains ACE_Message_Block objects) and ACE_Thread_Mutex objects to implement this functionality. The input object is active, managing timeouts and input events in its @@ -119,7 +121,7 @@ object tries to start a new transmission. If another transmission is in progress, the method returns an error. Otherwise, the relay object's start transmission method initializes itself and the input and output device objects, activates the input device object, and stores the handle for -the new input device thread. +the new input device thread. The driver then constructs a timeout handler with a count of the number of messages to relay and a send timeout value, and pushes a @@ -168,7 +170,7 @@ maintains a count of the number of messages it has sent. Once the input device has sent all its messages, it marks itself inactive, and its thread simply exits. -4. ACCESSING THE SOURCE CODE +4. ACCESSING THE SOURCE CODE The files for this example are located in $ACE_ROOT/examples/Bounded_Packet_Relay in the latest release of ACE, diff --git a/ACE/examples/C++NPv1/Makefile.am b/ACE/examples/C++NPv1/Makefile.am deleted file mode 100644 index 7a1b1afee8d..00000000000 --- a/ACE/examples/C++NPv1/Makefile.am +++ /dev/null @@ -1,198 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.C++NPv1_Iterative_Logging_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += iterative_logging_server - -iterative_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -iterative_logging_server_SOURCES = \ - Iterative_Logging_Server.cpp \ - Logging_Handler.cpp \ - Logging_Server.cpp \ - Iterative_Logging_Server.h \ - Logging_Handler.h \ - Logging_Server.h - -iterative_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv1_Logging_Client.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += logging_client - -logging_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -logging_client_SOURCES = \ - Logging_Client.cpp \ - Iterative_Logging_Server.h \ - Logging_Handler.h \ - Logging_Server.h \ - Process_Per_Connection_Logging_Server.h \ - RT_Thread_Per_Connection_Logging_Server.h \ - Reactive_Logging_Server.h \ - Reactive_Logging_Server_Ex.h \ - Thread_Per_Connection_Logging_Server.h - -logging_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.C++NPv1_PPC_Logging_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += ppc_logging_server - -ppc_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ppc_logging_server_SOURCES = \ - Logging_Handler.cpp \ - Logging_Server.cpp \ - Process_Per_Connection_Logging_Server.cpp \ - Logging_Handler.h \ - Logging_Server.h \ - Process_Per_Connection_Logging_Server.h - -ppc_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv1_RTTPC_Logging_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += RTTPC_logging_server - -RTTPC_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -RTTPC_logging_server_SOURCES = \ - Logging_Handler.cpp \ - Logging_Server.cpp \ - RT_Thread_Per_Connection_Logging_Server.cpp \ - Logging_Handler.h \ - Logging_Server.h \ - RT_Thread_Per_Connection_Logging_Server.h - -RTTPC_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv1_Reactive_Logging_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += reactive_logging_server - -reactive_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -reactive_logging_server_SOURCES = \ - Logging_Handler.cpp \ - Logging_Server.cpp \ - Reactive_Logging_Server.cpp \ - Logging_Handler.h \ - Logging_Server.h \ - Reactive_Logging_Server.h - -reactive_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv1_Reactive_Logging_Server_Ex.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += reactive_logging_server_ex - -reactive_logging_server_ex_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -reactive_logging_server_ex_SOURCES = \ - Logging_Handler.cpp \ - Logging_Server.cpp \ - Reactive_Logging_Server_Ex.cpp \ - Logging_Handler.h \ - Logging_Server.h \ - Reactive_Logging_Server_Ex.h - -reactive_logging_server_ex_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv1_TPC_Logging_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += tpc_logging_server - -tpc_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tpc_logging_server_SOURCES = \ - Logging_Handler.cpp \ - Logging_Server.cpp \ - Thread_Per_Connection_Logging_Server.cpp \ - Logging_Handler.h \ - Logging_Server.h \ - Thread_Per_Connection_Logging_Server.h - -tpc_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/C++NPv1/README b/ACE/examples/C++NPv1/README index 747fa24ecfc..079efe239b3 100644 --- a/ACE/examples/C++NPv1/README +++ b/ACE/examples/C++NPv1/README @@ -1,4 +1,4 @@ -(This is file $Id$) +$Id$ The files in this directory contain the source code from the book ``C++ Network Programming: Mastering Complexity Using ACE and diff --git a/ACE/examples/C++NPv2/Makefile.am b/ACE/examples/C++NPv2/Makefile.am deleted file mode 100644 index f6c3d89bc4e..00000000000 --- a/ACE/examples/C++NPv2/Makefile.am +++ /dev/null @@ -1,427 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_HEADERS = -noinst_LTLIBRARIES = -noinst_PROGRAMS = - -## Makefile.C++NPv2_AC_CLD.am - -if BUILD_SSL -if BUILD_THREADS -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES += libAC_CLD.la - -libAC_CLD_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ \ - -DAC_CLD_BUILD_DLL - -libAC_CLD_la_SOURCES = \ - AC_Client_Logging_Daemon.cpp \ - Logging_Handler.cpp - -libAC_CLD_la_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -noinst_HEADERS += \ - AC_Client_Logging_Daemon.h \ - Logging_Handler.h \ - Reactor_Logging_Server_T.cpp - -endif !BUILD_USES_WCHAR -endif BUILD_THREADS -endif BUILD_SSL - -## Makefile.C++NPv2_AIO_CLD.am - -if BUILD_SSL - -noinst_LTLIBRARIES += libAIO_CLD.la - -libAIO_CLD_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ \ - -DAIO_CLD_BUILD_DLL - -libAIO_CLD_la_SOURCES = \ - AIO_Client_Logging_Daemon.cpp - -libAIO_CLD_la_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -noinst_HEADERS += \ - AIO_Client_Logging_Daemon.h \ - Reactor_Logging_Server_T.cpp - -endif BUILD_SSL - -## Makefile.C++NPv2_CLD.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES += libCLD.la - -libCLD_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DCLD_BUILD_DLL - -libCLD_la_SOURCES = \ - Client_Logging_Daemon.cpp \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Handler.cpp - -noinst_HEADERS += \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Handler.h \ - Reactor_Logging_Server_T.cpp - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_Configurable_Log_Server.am - -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += configurable_logging_server - -configurable_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -configurable_logging_server_SOURCES = \ - Configurable_Logging_Server.cpp \ - Service_Reporter.cpp \ - Service_Reporter.h - -configurable_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR - -## Makefile.C++NPv2_Display_Logfile.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += display_logfile - -display_logfile_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -display_logfile_SOURCES = \ - display_logfile.cpp \ - AC_CLD_export.h \ - AC_Client_Logging_Daemon.h \ - AIO_CLD_export.h \ - AIO_Client_Logging_Daemon.h \ - CLD_export.h \ - Logging_Acceptor.h \ - Logging_Acceptor_Ex.h \ - Logging_Event_Handler.h \ - Logging_Event_Handler_Ex.h \ - Logging_Handler.h \ - Reactor_Logging_Server_Adapter.h \ - Reactor_Logging_Server_T.h \ - SLDEX_export.h \ - SLD_export.h \ - Service_Reporter.h \ - TPCLS_export.h \ - TPC_Logging_Server.h \ - TPLS_export.h \ - TP_Logging_Server.h - -display_logfile_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_Reactor_Log_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += reactor_logging_server - -reactor_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -reactor_logging_server_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Event_Handler_Ex.cpp \ - Logging_Handler.cpp \ - Reactor_Logging_Server.cpp \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Event_Handler_Ex.h \ - Logging_Handler.h - -reactor_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_SLD.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES += libSLD.la - -libSLD_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DSLD_BUILD_DLL - -libSLD_la_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Handler.cpp \ - SLD.cpp - -noinst_HEADERS += \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Handler.h \ - Reactor_Logging_Server_T.cpp - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_SLDex.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES += libSLDex.la - -libSLDex_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DSLDEX_BUILD_DLL - -libSLDex_la_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Event_Handler_Ex.cpp \ - Logging_Handler.cpp \ - Reactor_Logging_Server_Adapter.cpp \ - SLDex.cpp \ - Server_Shutdown.cpp - -noinst_HEADERS += \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Event_Handler_Ex.h \ - Logging_Handler.h \ - Reactor_Logging_Server_Adapter.h \ - Reactor_Logging_Server_T.cpp - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_SR_Configurable_Log_Server.am - -noinst_PROGRAMS += sr_configurable_logging_server - -sr_configurable_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -sr_configurable_logging_server_SOURCES = \ - SR_Configurable_Logging_Server.cpp \ - AC_CLD_export.h \ - AC_Client_Logging_Daemon.h \ - AIO_CLD_export.h \ - AIO_Client_Logging_Daemon.h \ - CLD_export.h \ - Logging_Acceptor.h \ - Logging_Acceptor_Ex.h \ - Logging_Event_Handler.h \ - Logging_Event_Handler_Ex.h \ - Logging_Handler.h \ - Reactor_Logging_Server_Adapter.h \ - Reactor_Logging_Server_T.h \ - SLDEX_export.h \ - SLD_export.h \ - Service_Reporter.h \ - TPCLS_export.h \ - TPC_Logging_Server.h \ - TPLS_export.h \ - TP_Logging_Server.h - -sr_configurable_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.C++NPv2_Select_Reactor_Log_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += select_reactor_logging_server - -select_reactor_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -select_reactor_logging_server_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Event_Handler_Ex.cpp \ - Logging_Handler.cpp \ - Select_Reactor_Logging_Server.cpp \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Event_Handler_Ex.h \ - Logging_Handler.h - -select_reactor_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_TPCLS.am - -if BUILD_SSL -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES += libTPCLS.la - -libTPCLS_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ \ - -DTPCLS_BUILD_DLL - -libTPCLS_la_SOURCES = \ - Logging_Handler.cpp \ - TPC_Logging_Server.cpp - -libTPCLS_la_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -noinst_HEADERS += \ - Logging_Handler.h \ - Reactor_Logging_Server_T.cpp \ - TPC_Logging_Server.h - -endif !BUILD_USES_WCHAR -endif BUILD_SSL - -## Makefile.C++NPv2_TPLS.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES += libTPLS.la - -libTPLS_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DTPLS_BUILD_DLL - -libTPLS_la_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Handler.cpp \ - TP_Logging_Server.cpp - -noinst_HEADERS += \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Handler.h \ - Reactor_Logging_Server_T.cpp \ - TP_Logging_Server.h - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_TP_Reactor_Log_Server.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += tp_reactor_logging_server - -tp_reactor_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tp_reactor_logging_server_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Event_Handler_Ex.cpp \ - Logging_Handler.cpp \ - TP_Reactor_Logging_Server.cpp \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Event_Handler_Ex.h \ - Logging_Handler.h - -tp_reactor_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Makefile.C++NPv2_WFMO_Reactor_Log_Server.am - -if BUILD_WFMO -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_PROGRAMS += wfmo_reactor_logging_server - -wfmo_reactor_logging_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -wfmo_reactor_logging_server_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Event_Handler.cpp \ - Logging_Event_Handler_Ex.cpp \ - Logging_Handler.cpp \ - WFMO_Reactor_Logging_Server.cpp \ - Logging_Acceptor.h \ - Logging_Event_Handler.h \ - Logging_Event_Handler_Ex.h \ - Logging_Handler.h - -wfmo_reactor_logging_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO -endif BUILD_WFMO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/C++NPv2/README b/ACE/examples/C++NPv2/README index a2d8759dd80..4b4f5e165fa 100644 --- a/ACE/examples/C++NPv2/README +++ b/ACE/examples/C++NPv2/README @@ -1,4 +1,4 @@ -(This is file $Id$) +$Id$ The files in this directory contain the source code from the book ``C++ Network Programming: Systematic Reuse with ACE and Frameworks'' diff --git a/ACE/examples/ConfigViewer/Makefile.am b/ACE/examples/ConfigViewer/Makefile.am deleted file mode 100644 index af88c534c34..00000000000 --- a/ACE/examples/ConfigViewer/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ConfigViewer.am - -if BUILD_WXWINDOWS - -noinst_LTLIBRARIES = libConfigViewer.la - -libConfigViewer_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_WX_CPPFLAGS) - -libConfigViewer_la_SOURCES = \ - ConfigTreeCtrl.cpp \ - ConfigurationViewer.cpp \ - MainFrame.cpp \ - ValueDlg.cpp \ - ValueListCtrl.cpp - -libConfigViewer_la_LDFLAGS = \ - $(ACE_WX_LDFLAGS) - -noinst_HEADERS = \ - ConfigTreeCtrl.h \ - MainFrame.h \ - ValueDlg.h \ - ValueListCtrl.h - -endif BUILD_WXWINDOWS - -EXTRA_DIST = \ - ConfigurationViewer.rc - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/ConfigViewer/README b/ACE/examples/ConfigViewer/README index 1f83c2dc848..66ac158aff8 100644 --- a/ACE/examples/ConfigViewer/README +++ b/ACE/examples/ConfigViewer/README @@ -1,17 +1,19 @@ +$Id$ + Configuration Viewer 1.0 ======================== -This is something I quickly threw together to allow GUI editing of +This is something I quickly threw together to allow GUI editing of ACE_Configuration files. I thought it would be useful and serve as a better example of how to use ACE_Configuration. I developed this under Windows 2000, but it should easily port to any platform that wxWindows -supports (see http://www.wxwindows.org.). +supports (see http://www.wxwindows.org.). ============== Usage ============== All functionality is delivered through the file menu and right mouse button -context menus. The file menu lets you create the different types of +context menus. The file menu lets you create the different types of ACE_Configurations such as a transient heap, persistent heap or Win32 Registry heap. A new persistent heap may be created, or an older one may be opened. The win32 registry will require you to enter the path @@ -23,7 +25,7 @@ may import or export entries from a heap to an INI file using the Import/Export file commands. The right mouse button opens up a context menu in both the tree control -and the list control. +and the list control. From the tree context menu, you can: 1) Create new keys (these hold name/value pairs) 2) Create new string values @@ -46,7 +48,7 @@ Known Bugs/Issues: *) The entire configuration file is loaded into the tree when it is opened. For large configurations, this may take a while. A good improvement would be to load items as the user expands them. -*) At the time of this writing, there is a nasty bug in +*) At the time of this writing, there is a nasty bug in ACE_Configuration_Heap that has to do with changing the value of an existing entry. I have submitted a patch to fix this, but it may not go in until 5.1.3 (current version is 5.1.2). I strongly diff --git a/ACE/examples/Connection/Makefile.am b/ACE/examples/Connection/Makefile.am deleted file mode 100644 index 36a9cc8383a..00000000000 --- a/ACE/examples/Connection/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - blocking \ - misc \ - non_blocking - diff --git a/ACE/examples/Connection/blocking/Makefile.am b/ACE/examples/Connection/blocking/Makefile.am deleted file mode 100644 index 60957cddcb2..00000000000 --- a/ACE/examples/Connection/blocking/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Connection_Blocking_Acceptor.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += acceptor - -acceptor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -acceptor_SOURCES = \ - SPIPE-acceptor.cpp \ - test_spipe_acceptor.cpp \ - SPIPE-acceptor.h - -acceptor_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Connection_Blocking_Connector.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += connector - -connector_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -connector_SOURCES = \ - SPIPE-connector.cpp \ - test_spipe_connector.cpp \ - SPIPE-connector.h - -connector_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Connection/blocking/README b/ACE/examples/Connection/blocking/README index c7763e3ed04..c347901a010 100644 --- a/ACE/examples/Connection/blocking/README +++ b/ACE/examples/Connection/blocking/README @@ -1,3 +1,5 @@ +$Id$ + Presently, this directory contains only one example application for SPIPEs. The test source code is contained in SPIPE-acceptor.h and SPIPE-connector.h. @@ -29,7 +31,7 @@ hello starting up daemon test_sock_connector Opening acepipe activating 5 - + please enter input..: hello There are a number of other options that you can provide. Please see diff --git a/ACE/examples/Connection/misc/Makefile.am b/ACE/examples/Connection/misc/Makefile.am deleted file mode 100644 index 58a17aad6c8..00000000000 --- a/ACE/examples/Connection/misc/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Connection_Misc_Handler.am - -noinst_PROGRAMS = handler - -handler_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -handler_SOURCES = \ - Connection_Handler.cpp \ - Connection_Handler.h - -handler_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Connection_Misc_Test_Upipe.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_upipe - -test_upipe_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_upipe_SOURCES = \ - test_upipe.cpp \ - test_upipe.h - -test_upipe_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Connection/non_blocking/Makefile.am b/ACE/examples/Connection/non_blocking/Makefile.am deleted file mode 100644 index 3f168c27031..00000000000 --- a/ACE/examples/Connection/non_blocking/Makefile.am +++ /dev/null @@ -1,158 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Connection_Non_Blocking_LSockClient.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += lsock_client - -lsock_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -lsock_client_SOURCES = \ - CPP-connector.cpp \ - test_lsock_connector.cpp \ - CPP-connector.h - -lsock_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Connection_Non_Blocking_LSockServer.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += lsock_server - -lsock_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -lsock_server_SOURCES = \ - CPP-acceptor.cpp \ - test_lsock_acceptor.cpp \ - CPP-acceptor.h - -lsock_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Connection_Non_Blocking_SPipeClient.am - -noinst_PROGRAMS += spipe_client - -spipe_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -spipe_client_SOURCES = \ - CPP-connector.cpp \ - test_spipe_connector.cpp \ - CPP-connector.h - -spipe_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Connection_Non_Blocking_SPipeServer.am - -noinst_PROGRAMS += spipe_server - -spipe_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -spipe_server_SOURCES = \ - CPP-acceptor.cpp \ - test_spipe_acceptor.cpp \ - CPP-acceptor.h - -spipe_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Connection_Non_Blocking_SockClient.am - -noinst_PROGRAMS += sock_client - -sock_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -sock_client_SOURCES = \ - CPP-connector.cpp \ - test_sock_connector.cpp \ - CPP-connector.h - -sock_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Connection_Non_Blocking_SockServer.am - -noinst_PROGRAMS += sock_server - -sock_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -sock_server_SOURCES = \ - CPP-acceptor.cpp \ - test_sock_acceptor.cpp \ - CPP-acceptor.h - -sock_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Connection_Non_Blocking_TLIClient.am - -noinst_PROGRAMS += tli_client - -tli_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tli_client_SOURCES = \ - CPP-connector.cpp \ - test_tli_connector.cpp \ - CPP-connector.h - -tli_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Connection_Non_Blocking_TLIServer.am - -noinst_PROGRAMS += tli_server - -tli_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tli_server_SOURCES = \ - CPP-acceptor.cpp \ - test_tli_acceptor.cpp \ - CPP-acceptor.h - -tli_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Connection/non_blocking/README b/ACE/examples/Connection/non_blocking/README index 74c44fe6de7..85904a6f9ae 100644 --- a/ACE/examples/Connection/non_blocking/README +++ b/ACE/examples/Connection/non_blocking/README @@ -1,3 +1,5 @@ +$Id$ + This code illustrates how to write a single set of source code (for a client and server) and then parameterize in the desired IPC mechanism. In this case, the IPC mechanisms include sockets, TLI, and STREAM diff --git a/ACE/examples/DLL/Makefile.am b/ACE/examples/DLL/Makefile.am deleted file mode 100644 index 5e76d980938..00000000000 --- a/ACE/examples/DLL/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.DLL_Today.am - -noinst_LTLIBRARIES = libDLL_Today.la - -libDLL_Today_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -libDLL_Today_la_SOURCES = \ - Today.cpp - -noinst_HEADERS = \ - Today.h - -## Makefile.DLL_Newsweek.am - -noinst_LTLIBRARIES += libDLL_Newsweek.la - -libDLL_Newsweek_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -libDLL_Newsweek_la_SOURCES = \ - Newsweek.cpp - -noinst_HEADERS += \ - Newsweek.h - -## Makefile.DLL_Main.am - -noinst_PROGRAMS = test_dll - -test_dll_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_dll_SOURCES = \ - test_dll.cpp \ - Magazine.h \ - Newsweek.h \ - Today.h - -test_dll_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/DLL/README b/ACE/examples/DLL/README index 3526af927a9..2414c6a7a81 100644 --- a/ACE/examples/DLL/README +++ b/ACE/examples/DLL/README @@ -15,7 +15,7 @@ objects like Newsweek and Today deriving form it. The libraries are dynamically linked on demand. Thus, they can be changed on the fly and accessed with its new changes. -The ACE_DLL class used in this example is an helper class for +The ACE_DLL class used in this example is an helper class for performing various operations on the library object. Compilation and Execution: @@ -39,7 +39,7 @@ Compilation and Execution: Load DLL.sln which contains DLL_Main.vcproj, DLL_Today.vcproj and DLL_Newsweek.vcproj. Build each vcproj such that you build DLL_Main.vcproj last. - This is because the test_dll.exe will be using Today.dll and Newsweek.dll. + This is because the test_dll.exe will be using Today.dll and Newsweek.dll. Execute test_dll diff --git a/ACE/examples/Export/Makefile.am b/ACE/examples/Export/Makefile.am deleted file mode 100644 index 671f716aaae..00000000000 --- a/ACE/examples/Export/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Export_Lib.am - -noinst_LTLIBRARIES = libExport_Lib.la - -libExport_Lib_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DTEST_BUILD_DLL - -libExport_Lib_la_SOURCES = \ - dll.cpp - -noinst_HEADERS = \ - dll.h - -## Makefile.Export_Test.am - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - dll.h \ - test_export.h - -test_LDADD = \ - libExport_Lib.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IOStream/Makefile.am b/ACE/examples/IOStream/Makefile.am deleted file mode 100644 index 3ad9fe59404..00000000000 --- a/ACE/examples/IOStream/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - client \ - server - diff --git a/ACE/examples/IOStream/README b/ACE/examples/IOStream/README index ab215fc779d..80ce2e68b94 100644 --- a/ACE/examples/IOStream/README +++ b/ACE/examples/IOStream/README @@ -1,3 +1,5 @@ +$Id$ + This example illustrates the use of the ACE_IOStream and ACE_Streambuf_T templates to create an object based on ACE_*_Stream classes. These classes provide C++ iostream functionality across a @@ -7,7 +9,7 @@ To run the tests simply build the executables in the client and server directories and then do the following in separate windows: # Window 1 -% server/iostream_server +% server/iostream_server (10049) starting up daemon # Window 2 diff --git a/ACE/examples/IOStream/client/Makefile.am b/ACE/examples/IOStream/client/Makefile.am deleted file mode 100644 index 28b28e0941c..00000000000 --- a/ACE/examples/IOStream/client/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.IOStream_Client.am - -noinst_PROGRAMS = iostream_client - -iostream_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -iostream_client_SOURCES = \ - iostream_client.cpp - -iostream_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IOStream/server/Makefile.am b/ACE/examples/IOStream/server/Makefile.am deleted file mode 100644 index f3d195a413b..00000000000 --- a/ACE/examples/IOStream/server/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.IOStream_Server.am - -noinst_PROGRAMS = iostream_server - -iostream_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -iostream_server_SOURCES = \ - iostream_server.cpp \ - iostream_server.h - -iostream_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am deleted file mode 100644 index 45504c71ea1..00000000000 --- a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.atm_sap_client.am - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - CPP-client.cpp - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.atm_sap_server.am - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_SOURCES = \ - CPP-server.cpp - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am deleted file mode 100644 index ecc65507d22..00000000000 --- a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - reader \ - writer - diff --git a/ACE/examples/IPC_SAP/DEV_SAP/README b/ACE/examples/IPC_SAP/DEV_SAP/README index 8e47d8c5cec..e99aa8830d2 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/README +++ b/ACE/examples/IPC_SAP/DEV_SAP/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains a test example for the DEV_SAP class category. It implements a class TTY_IO that is derived from ACE_DEV_IO and adds a control method diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am deleted file mode 100644 index ebd4eb798b8..00000000000 --- a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.dev_sap_reader.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = reader - -reader_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -reader_SOURCES = \ - reader.cpp - -reader_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am deleted file mode 100644 index b660839e482..00000000000 --- a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.dev_sap_writer.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = writer - -writer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -writer_SOURCES = \ - writer.cpp - -writer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am deleted file mode 100644 index b207926d2c8..00000000000 --- a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am +++ /dev/null @@ -1,103 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Fifo_Sap_Msg_Client.am - -noinst_PROGRAMS = FIFO-Msg-client - -FIFO_Msg_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -FIFO_Msg_client_SOURCES = \ - FIFO-Msg-client.cpp - -FIFO_Msg_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Fifo_Sap_Msg_Server.am - -noinst_PROGRAMS += FIFO-Msg-server - -FIFO_Msg_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -FIFO_Msg_server_SOURCES = \ - FIFO-Msg-server.cpp - -FIFO_Msg_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.fifo_sap_client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += FIFO-client - -FIFO_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -FIFO_client_SOURCES = \ - FIFO-client.cpp - -FIFO_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.fifo_sap_server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += FIFO-server - -FIFO_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -FIFO_server_SOURCES = \ - FIFO-server.cpp - -FIFO_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.fifo_sap_test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += FIFO-test - -FIFO_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -FIFO_test_SOURCES = \ - FIFO-test.cpp - -FIFO_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am deleted file mode 100644 index 64d2126adcf..00000000000 --- a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.file_sap_client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/Makefile.am b/ACE/examples/IPC_SAP/Makefile.am deleted file mode 100644 index 31c046f885a..00000000000 --- a/ACE/examples/IPC_SAP/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - ATM_SAP \ - DEV_SAP \ - FIFO_SAP \ - FILE_SAP \ - SOCK_SAP \ - SPIPE_SAP \ - SSL_SAP \ - TLI_SAP \ - UPIPE_SAP - diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am deleted file mode 100644 index 803dc5bbf7f..00000000000 --- a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am +++ /dev/null @@ -1,188 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Sock_Sap_CPP_Inclient.am - -noinst_PROGRAMS = CPP-inclient - -CPP_inclient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_inclient_SOURCES = \ - CPP-inclient.cpp \ - CPP-inclient.h - -CPP_inclient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sock_Sap_CPP_Inserver.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += CPP-inserver - -CPP_inserver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_inserver_SOURCES = \ - CPP-inserver.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -CPP_inserver_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Sock_Sap_CPP_Memclient.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += CPP-memclient - -CPP_memclient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_memclient_SOURCES = \ - CPP-memclient.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -CPP_memclient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Sock_Sap_CPP_Memserver.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += CPP-memserver - -CPP_memserver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_memserver_SOURCES = \ - CPP-memserver.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -CPP_memserver_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Sock_Sap_CPP_Unclient.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += CPP-unclient - -CPP_unclient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_unclient_SOURCES = \ - CPP-unclient.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -CPP_unclient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Sock_Sap_CPP_Unserver.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += CPP-unserver - -CPP_unserver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_unserver_SOURCES = \ - CPP-unserver.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -CPP_unserver_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Sock_Sap_C_Inclient.am - -noinst_PROGRAMS += C-inclient - -C_inclient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -C_inclient_SOURCES = \ - C-inclient.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -C_inclient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sock_Sap_C_Inserver.am - -noinst_PROGRAMS += C-inserver - -C_inserver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -C_inserver_SOURCES = \ - C-inserver.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -C_inserver_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sock_Sap_FD_Unclient.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += FD-unclient - -FD_unclient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -FD_unclient_SOURCES = \ - FD-unclient.cpp \ - CPP-inclient.h \ - CPP-inserver-fancy.h - -FD_unclient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/README b/ACE/examples/IPC_SAP/SOCK_SAP/README index bbe0f20ce5a..f8c0145ef48 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/README +++ b/ACE/examples/IPC_SAP/SOCK_SAP/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains groups of client and server test programs that exercise the various C++ wrappers for sockets. In general, the test programs do more or less the same thing -- the client establishes a @@ -9,12 +11,12 @@ Unless noted differently, the server is implemented as an "iterative server," i.e., it only deals with one client at a time. The following describes each set of tests in more detail: - . C-{inclient,inserver}.cpp -- This is basically a C code - implementation that opens a connection to the server and - sends all the data from the stdin using Internet domain - sockets (i.e., TCP). + . C-{inclient,inserver}.cpp -- This is basically a C code + implementation that opens a connection to the server and + sends all the data from the stdin using Internet domain + sockets (i.e., TCP). - . CPP-{inclient,inserver}.cpp -- This test is + . CPP-{inclient,inserver}.cpp -- This test is a more sophisticated C++ wrapper version of the preceeding "C" test using Internet domain sockets (i.e., TCP). It allows you to test oneway and twoway socket communication @@ -25,20 +27,20 @@ describes each set of tests in more detail: version of CPP-inserver.cpp that illustrates additional features of ACE, such as ACE_Svc_Handler. - . CPP-inserver-poll.cpp -- This test illustrates how to - write single-threaded concurrent servers using UNIX SVR4 - poll(). You can run this test using the CPP-inclient.cpp - program as the oneway client. + . CPP-inserver-poll.cpp -- This test illustrates how to + write single-threaded concurrent servers using UNIX SVR4 + poll(). You can run this test using the CPP-inclient.cpp + program as the oneway client. - . CPP-{unclient,unserver}.cpp -- This test is basically - a C++ wrapper version of the preceeding "C++" test using - UNIX domain sockets. Note that this test only works + . CPP-{unclient,unserver}.cpp -- This test is basically + a C++ wrapper version of the preceeding "C++" test using + UNIX domain sockets. Note that this test only works between a client and server process on the same machine. - . FD-{unclient,inclient}.cpp -- This test illustrates - how to pass file descriptors between a client and a - concurrent server process on the same machine using the ACE - C++ wrappers for UNIX domain sockets. + . FD-{unclient,inclient}.cpp -- This test illustrates + how to pass file descriptors between a client and a + concurrent server process on the same machine using the ACE + C++ wrappers for UNIX domain sockets. For examples of the ACE SOCK_{Dgram,CODgram} and SOCK_Dgram_{Mcast,Bcast} wrappers, please take a look in the diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am deleted file mode 100644 index 9979c8a5751..00000000000 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am +++ /dev/null @@ -1,140 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.SPIPE_SAP_Client.am - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - shared.h - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_SAP_Consumer_Msg.am - -noinst_PROGRAMS += consumer_msg - -consumer_msg_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -consumer_msg_SOURCES = \ - consumer_msg.cpp \ - shared.h - -consumer_msg_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_SAP_Consumer_Read.am - -noinst_PROGRAMS += consumer_read - -consumer_read_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -consumer_read_SOURCES = \ - consumer_read.cpp \ - shared.h - -consumer_read_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_SAP_NPClient.am - -noinst_PROGRAMS += NPClient - -NPClient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -NPClient_SOURCES = \ - NPClient.cpp \ - shared.h - -NPClient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_SAP_NPServer.am - -noinst_PROGRAMS += NPServer - -NPServer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -NPServer_SOURCES = \ - NPServer.cpp \ - shared.h - -NPServer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_SAP_Producer_Msg.am - -noinst_PROGRAMS += producer_msg - -producer_msg_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -producer_msg_SOURCES = \ - producer_msg.cpp \ - shared.h - -producer_msg_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_SAP_Producer_Read.am - -noinst_PROGRAMS += producer_read - -producer_read_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -producer_read_SOURCES = \ - producer_read.cpp \ - shared.h - -producer_read_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_SAP_Server.am - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - shared.h - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am deleted file mode 100644 index 5a0e4bc3dfb..00000000000 --- a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am +++ /dev/null @@ -1,196 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SSL_SAP_Client.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -client_SOURCES = \ - SSL-client.cpp \ - SSL-client.h - -client_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -## Makefile.SSL_SAP_Client_Simple.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client-simple - -client_simple_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -client_simple_SOURCES = \ - SSL-client-simple.cpp \ - SSL-client-simple.h - -client_simple_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -client_simple_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -## Makefile.SSL_SAP_Server.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -server_SOURCES = \ - SSL-server.cpp \ - SSL-client-simple.h \ - SSL-client.h \ - SSL-server-fancy.h - -server_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -## Makefile.SSL_SAP_Server_Fancy.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server-fancy - -server_fancy_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -server_fancy_SOURCES = \ - SSL-server-fancy.cpp \ - SSL-server-fancy.h - -server_fancy_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -server_fancy_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -## Makefile.SSL_SAP_Server_Poll.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server-poll - -server_poll_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -server_poll_SOURCES = \ - SSL-server-poll.cpp \ - SSL-client-simple.h \ - SSL-client.h \ - SSL-server-fancy.h - -server_poll_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -server_poll_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -## Makefile.SSL_SAP_Server_Simple.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server-simple - -server_simple_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -server_simple_SOURCES = \ - SSL-server-simple.cpp \ - SSL-client-simple.h \ - SSL-client.h \ - SSL-server-fancy.h - -server_simple_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -server_simple_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/SSL_SAP/README b/ACE/examples/IPC_SAP/SSL_SAP/README index 43f4640e75a..25a812ccb9b 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/README +++ b/ACE/examples/IPC_SAP/SSL_SAP/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This directory contains groups of client and server test programs that exercise the various C++ wrappers for SSL sockets. In general, the @@ -11,7 +11,7 @@ Unless noted differently, the server is implemented as an "iterative server," i.e., it only deals with one client at a time. The following describes each set of tests in more detail: - . SSL-{client,server}.cpp -- This test allows you to test + . SSL-{client,server}.cpp -- This test allows you to test oneway and twoway socket communication latency and throughput over SSL between two processes on the same machine or on different machines. diff --git a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am deleted file mode 100644 index 3f9a09726d2..00000000000 --- a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am +++ /dev/null @@ -1,132 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.TLI_SAP_ATM_Client.am - -noinst_PROGRAMS = ATM-client - -ATM_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ATM_client_SOURCES = \ - CPP-ATM-client.cpp - -ATM_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TLI_SAP_ATM_Server.am - -noinst_PROGRAMS += ATM-server - -ATM_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ATM_server_SOURCES = \ - CPP-ATM-server.cpp - -ATM_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TLI_SAP_CPP_Client.am - -noinst_PROGRAMS += CPP-client - -CPP_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_client_SOURCES = \ - CPP-client.cpp - -CPP_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TLI_SAP_CPP_Server.am - -noinst_PROGRAMS += CPP-server - -CPP_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CPP_server_SOURCES = \ - CPP-server.cpp - -CPP_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TLI_SAP_Db_Client.am - -noinst_PROGRAMS += db-client - -db_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -db_client_SOURCES = \ - db-client.cpp - -db_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TLI_SAP_Db_Server.am - -noinst_PROGRAMS += db-server - -db_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -db_server_SOURCES = \ - db-server.cpp - -db_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TLI_SAP_Ftp_Client.am - -noinst_PROGRAMS += ftp-client - -ftp_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ftp_client_SOURCES = \ - ftp-client.cpp - -ftp_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TLI_SAP_Ftp_Server.am - -noinst_PROGRAMS += ftp-server - -ftp_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ftp_server_SOURCES = \ - ftp-server.cpp - -ftp_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am deleted file mode 100644 index 90563ab7883..00000000000 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.UPIPE_SAP_Ex1.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += ex1 - -ex1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ex1_SOURCES = \ - ex1.cpp - -ex1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.UPIPE_SAP_Ex2.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += ex2 - -ex2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ex2_SOURCES = \ - ex2.cpp - -ex2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.UPIPE_SAP_Ex3.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += ex3 - -ex3_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ex3_SOURCES = \ - ex3.cpp - -ex3_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/README b/ACE/examples/Log_Msg/Log_Msg_MFC/README index d64001aff87..8d6d12675c8 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/README +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/README @@ -1,7 +1,9 @@ +$Id$ + MFC Logging Example documentation ================================= by Craig Rodrigues <crodrigu@bbn.com> - 2002/08/02 + 2002/08/02 The example in this directory is a Microsoft Foundation Class (MFC) example which illustrates how to write an ACE_Log_Msg_Callback which diff --git a/ACE/examples/Log_Msg/Makefile.am b/ACE/examples/Log_Msg/Makefile.am deleted file mode 100644 index 9653b5933dc..00000000000 --- a/ACE/examples/Log_Msg/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Log_Msg_Test_Callback.am - -noinst_PROGRAMS = test_callback - -test_callback_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_callback_SOURCES = \ - test_callback.cpp - -test_callback_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Log_Msg_Test_Log_Msg.am - -noinst_PROGRAMS += test_log_msg - -test_log_msg_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_log_msg_SOURCES = \ - test_log_msg.cpp - -test_log_msg_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Log_Msg_Test_Ostream.am - -noinst_PROGRAMS += test_ostream - -test_ostream_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_ostream_SOURCES = \ - test_ostream.cpp - -test_ostream_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Log_Msg/README b/ACE/examples/Log_Msg/README index 047caf9ca77..78446f44b41 100644 --- a/ACE/examples/Log_Msg/README +++ b/ACE/examples/Log_Msg/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains program(s) that demonstrate how to use ACE's Log_Msg class to record various information. @@ -5,61 +7,61 @@ Log_Msg class to record various information. abstraction wrt writing to user defined callback objects. * test_ostream.cpp: This program illustrates how the - ACE_Log_Msg abstraction can be used to write to + ACE_Log_Msg abstraction can be used to write to stderr and to a file. For even more sophisticated - use-cases of ACE_Log_Msg please see the + use-cases of ACE_Log_Msg please see the $ACE_ROOT/netsvcs/clients/Logger/ examples. - * test_log_msg.cpp: This program tests various feature of the + * test_log_msg.cpp: This program tests various feature of the Log_Msg facility. It opens a log file and writes some - messages using different log priorities and output stream. + messages using different log priorities and output stream. + + You can invoke the program with or without command + parameters. When invoked with any parameters like, - You can invoke the program with or without command - parameters. When invoked with any parameters like, + ./Log_Msg foobar - ./Log_Msg foobar + the log messages are direct to stdout (or, ostream in C++.) + In this case, the program simulates an error EWOULDBLOCK and + write an error log to stdout as, - the log messages are direct to stdout (or, ostream in C++.) - In this case, the program simulates an error EWOULDBLOCK and - write an error log to stdout as, + would block + op_status and errnum work! - would block - op_status and errnum work! + When invoked without any parameters, except does the same + test as above but logs to default log stream "stderr," the + program also demonstrates logging messages/errors with + different priority and changing the logging destination. A + sample output is, - When invoked without any parameters, except does the same - test as above but logs to default log stream "stderr," the - program also demonstrates logging messages/errors with - different priority and changing the logging destination. A - sample output is, + would block + op_status and errnum work! + 3.141600, hello = 10000 + 6.283200, world = 20000 + 6.283200, world = 20000 + 9.424800, world = 30000 + 12.566400, world = 40000 + 15.708000, world = 50000 + HEXDUMP 48 bytes + 01 00 00 00 02 00 00 00 04 00 00 00 08 00 00 00 ................ + 10 00 00 00 20 00 00 00 40 00 00 00 80 00 00 00 .... ...@....... + 00 01 00 00 00 02 00 00 00 04 00 00 00 08 00 00 ................ + ./Log_Msg.EXE: (2710), badname: Function not implemented - would block - op_status and errnum work! - 3.141600, hello = 10000 - 6.283200, world = 20000 - 6.283200, world = 20000 - 9.424800, world = 30000 - 12.566400, world = 40000 - 15.708000, world = 50000 - HEXDUMP 48 bytes - 01 00 00 00 02 00 00 00 04 00 00 00 08 00 00 00 ................ - 10 00 00 00 20 00 00 00 40 00 00 00 80 00 00 00 .... ...@....... - 00 01 00 00 00 02 00 00 00 04 00 00 00 08 00 00 ................ - ./Log_Msg.EXE: (2710), badname: Function not implemented + In this test, there are two lines containing "world` = + 20000." That's because in the program, both stderr and + stdout are "turned on" for logging before writing this log + message. The line containing "world = 30000" is written to + stdout only. Rest of the lines are all to the stderr. You + can examine this behavior by redirecting stderr and stdout + to different files. - In this test, there are two lines containing "world` = - 20000." That's because in the program, both stderr and - stdout are "turned on" for logging before writing this log - message. The line containing "world = 30000" is written to - stdout only. Rest of the lines are all to the stderr. You - can examine this behavior by redirecting stderr and stdout - to different files. + The HEXDUMP output shows how to take an arbitrary object and + hexdump its content for debugging. Finally, the program + shows an ordinary use case of logging error messages using + the ACE_ERROR macro. - The HEXDUMP output shows how to take an arbitrary object and - hexdump its content for debugging. Finally, the program - shows an ordinary use case of logging error messages using - the ACE_ERROR macro. + If you look into the program, there is also a demonstration + showing how to disable certain priorities of error message + temporarily. - If you look into the program, there is also a demonstration - showing how to disable certain priorities of error message - temporarily. - diff --git a/ACE/examples/Logger/Acceptor-server/Makefile.am b/ACE/examples/Logger/Acceptor-server/Makefile.am deleted file mode 100644 index b970349c834..00000000000 --- a/ACE/examples/Logger/Acceptor-server/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Logger_Acceptor_Server.am - -noinst_PROGRAMS = server_loggerd - -server_loggerd_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_loggerd_SOURCES = \ - server_loggerd.cpp \ - server_loggerd.h - -server_loggerd_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Logger/Makefile.am b/ACE/examples/Logger/Makefile.am deleted file mode 100644 index 29e3225dcbe..00000000000 --- a/ACE/examples/Logger/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Acceptor-server \ - client \ - simple-server - diff --git a/ACE/examples/Logger/README b/ACE/examples/Logger/README index bac9aa1d127..3a8a557c202 100644 --- a/ACE/examples/Logger/README +++ b/ACE/examples/Logger/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains a simple client/server implementation of the distributed logging server described in several papers in the C++ Report (which can be obtained via the following WWW URLs: @@ -5,28 +7,28 @@ http://www.cs.wustl.edu/~schmidt/{Reactor1-93.ps.gz,Reactor2-93.ps.gz}). The example consists of the following directories: - . client + . client - This program talks directly to the server logging - daemon. The server daemon must be started before you - can run this test. + This program talks directly to the server logging + daemon. The server daemon must be started before you + can run this test. - . simple-server + . simple-server - This program runs a simple, non-templated, - single-threaded Reactive implementation of the - distributed logging server daemon. + This program runs a simple, non-templated, + single-threaded Reactive implementation of the + distributed logging server daemon. - . Acceptor-server + . Acceptor-server - This program runs templated, Acceptor-based - single-threaded Reactive implementation of the - distributed logging server daemon. + This program runs templated, Acceptor-based + single-threaded Reactive implementation of the + distributed logging server daemon. To see a more complex solution that implements the design described in the C++ Report articles, please see the: -$ACE_ROOT/netsvcs/{clients,lib,servers} +$ACE_ROOT/netsvcs/{clients,lib,servers} directories. diff --git a/ACE/examples/Logger/client/Makefile.am b/ACE/examples/Logger/client/Makefile.am deleted file mode 100644 index 008d881f350..00000000000 --- a/ACE/examples/Logger/client/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Logger_client.am - -noinst_PROGRAMS = logging_app - -logging_app_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -logging_app_SOURCES = \ - logging_app.cpp - -logging_app_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Logger/simple-server/Makefile.am b/ACE/examples/Logger/simple-server/Makefile.am deleted file mode 100644 index d9a43e17ee6..00000000000 --- a/ACE/examples/Logger/simple-server/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Logger_Simple_Server.am - -noinst_PROGRAMS = server_loggerd - -server_loggerd_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_loggerd_SOURCES = \ - Logging_Acceptor.cpp \ - Logging_Handler.cpp \ - server_loggerd.cpp \ - Logging_Acceptor.h \ - Logging_Handler.h \ - Reactor_Singleton.h - -server_loggerd_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Makefile.am b/ACE/examples/Makefile.am deleted file mode 100644 index 7645d2f5823..00000000000 --- a/ACE/examples/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - APG \ - ASX \ - Bounded_Packet_Relay \ - C++NPv1 \ - C++NPv2 \ - ConfigViewer \ - Connection \ - DLL \ - Export \ - IOStream \ - IPC_SAP \ - Log_Msg \ - Logger \ - Map_Manager \ - Mem_Map \ - Misc \ - Monitor \ - NT_Service \ - Naming \ - OS \ - Reactor \ - Registry \ - Semaphores \ - Service_Configurator \ - Shared_Malloc \ - Shared_Memory \ - Smart_Pointers \ - Synch \ - System_V_IPC \ - Threads \ - Timer_Queue \ - Web_Crawler - diff --git a/ACE/examples/Map_Manager/Makefile.am b/ACE/examples/Map_Manager/Makefile.am deleted file mode 100644 index b5fc458338f..00000000000 --- a/ACE/examples/Map_Manager/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Map_Manager.am - -noinst_PROGRAMS = Map_Manager - -Map_Manager_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Map_Manager_SOURCES = \ - test_hash_map_manager.cpp - -Map_Manager_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Mem_Map/IO-tests/Makefile.am b/ACE/examples/Mem_Map/IO-tests/Makefile.am deleted file mode 100644 index 6466b5e8bb5..00000000000 --- a/ACE/examples/Mem_Map/IO-tests/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Mem_Map_IO_Tests.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = test_io - -test_io_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_io_SOURCES = \ - IO_Test.cpp \ - test_io.cpp \ - IO_Test.h - -test_io_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Mem_Map/Makefile.am b/ACE/examples/Mem_Map/Makefile.am deleted file mode 100644 index 4dec1a54c74..00000000000 --- a/ACE/examples/Mem_Map/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - IO-tests \ - file-reverse - diff --git a/ACE/examples/Mem_Map/file-reverse/Makefile.am b/ACE/examples/Mem_Map/file-reverse/Makefile.am deleted file mode 100644 index 16376720175..00000000000 --- a/ACE/examples/Mem_Map/file-reverse/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Mem_Map_File_Reverse.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = file-reverse - -file_reverse_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -file_reverse_SOURCES = \ - file-reverse.cpp - -file_reverse_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Misc/Makefile.am b/ACE/examples/Misc/Makefile.am deleted file mode 100644 index f1b726742c1..00000000000 --- a/ACE/examples/Misc/Makefile.am +++ /dev/null @@ -1,213 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Misc_Test_Dump.am - -noinst_PROGRAMS = test_dump - -test_dump_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_dump_SOURCES = \ - test_dump.cpp \ - test_dump.h - -test_dump_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_Get_Opt.am - -noinst_PROGRAMS += test_get_opt - -test_get_opt_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_get_opt_SOURCES = \ - test_get_opt.cpp \ - test_dump.h - -test_get_opt_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_Profile_Timer.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_profile_timer - -test_profile_timer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_profile_timer_SOURCES = \ - test_profile_timer.cpp \ - test_dump.h - -test_profile_timer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Misc_Test_Read_Buffer.am - -noinst_PROGRAMS += test_read_buffer - -test_read_buffer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_read_buffer_SOURCES = \ - test_read_buffer.cpp \ - test_dump.h - -test_read_buffer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_Set.am - -noinst_PROGRAMS += test_set - -test_set_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_set_SOURCES = \ - test_set.cpp \ - test_dump.h - -test_set_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_Sstring.am - -noinst_PROGRAMS += test_sstring - -test_sstring_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_sstring_SOURCES = \ - test_sstring.cpp \ - test_dump.h - -test_sstring_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_Timestamp.am - -noinst_PROGRAMS += test_timestamp - -test_timestamp_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_timestamp_SOURCES = \ - test_timestamp.cpp \ - test_dump.h - -test_timestamp_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_Trace.am - -noinst_PROGRAMS += test_trace - -test_trace_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_trace_SOURCES = \ - test_trace.cpp \ - test_dump.h - -test_trace_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_XtReactor1.am - -if BUILD_ACE_XTREACTOR -if BUILD_MOTIF -if BUILD_X11 -if BUILD_XT - -noinst_PROGRAMS += test_XtReactor1 - -test_XtReactor1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -test_XtReactor1_SOURCES = \ - test_XtReactor1.cpp \ - test_dump.h - -test_XtReactor1_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -test_XtReactor1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXm \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_MOTIF -endif BUILD_ACE_XTREACTOR - -## Makefile.Misc_Test_XtReactor2.am - -if BUILD_ACE_XTREACTOR -if BUILD_MOTIF -if BUILD_X11 -if BUILD_XT - -noinst_PROGRAMS += test_XtReactor2 - -test_XtReactor2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -test_XtReactor2_SOURCES = \ - test_XtReactor2.cpp \ - test_dump.h - -test_XtReactor2_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -test_XtReactor2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXm \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_MOTIF -endif BUILD_ACE_XTREACTOR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Misc/test_trace.cpp b/ACE/examples/Misc/test_trace.cpp index 862f638291a..10f8e679b07 100644 --- a/ACE/examples/Misc/test_trace.cpp +++ b/ACE/examples/Misc/test_trace.cpp @@ -38,8 +38,7 @@ #include "ace/OS_main.h" #include "ace/Signal.h" #include "ace/Task.h" - - +#include "ace/Trace.h" class My_Task : public ACE_Task_Base { diff --git a/ACE/examples/Monitor/Bytes_Sent/Makefile.am b/ACE/examples/Monitor/Bytes_Sent/Makefile.am deleted file mode 100644 index 5cde89b1970..00000000000 --- a/ACE/examples/Monitor/Bytes_Sent/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Bytes_Sent.am - -if !BUILD_WINCE - -noinst_PROGRAMS = bytes_sent - -bytes_sent_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -bytes_sent_SOURCES = \ - bytes_sent.cpp - -bytes_sent_LDADD = \ - $(top_builddir)/examples/Monitor/libMC_Test_Utilities.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Monitor/CPU_Load/Makefile.am b/ACE/examples/Monitor/CPU_Load/Makefile.am deleted file mode 100644 index fc3ce7b6063..00000000000 --- a/ACE/examples/Monitor/CPU_Load/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.CPU_Load.am - -if !BUILD_WINCE - -noinst_PROGRAMS = cpu_load - -cpu_load_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -cpu_load_SOURCES = \ - cpu_load.cpp - -cpu_load_LDADD = \ - $(top_builddir)/examples/Monitor/libMC_Test_Utilities.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Monitor/Constraint/Makefile.am b/ACE/examples/Monitor/Constraint/Makefile.am deleted file mode 100644 index 1b44f873784..00000000000 --- a/ACE/examples/Monitor/Constraint/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Constraint.am - -if !BUILD_WINCE - -noinst_PROGRAMS = constraint - -constraint_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -constraint_SOURCES = \ - constraint.cpp - -constraint_LDADD = \ - $(top_builddir)/examples/Monitor/libMC_Test_Utilities.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Monitor/Group/Makefile.am b/ACE/examples/Monitor/Group/Makefile.am deleted file mode 100644 index a5c887afba8..00000000000 --- a/ACE/examples/Monitor/Group/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Group.am - -if !BUILD_WINCE - -noinst_PROGRAMS = group - -group_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -group_SOURCES = \ - group.cpp - -group_LDADD = \ - $(top_builddir)/examples/Monitor/libMC_Test_Utilities.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Monitor/Makefile.am b/ACE/examples/Monitor/Makefile.am deleted file mode 100644 index f51d359067b..00000000000 --- a/ACE/examples/Monitor/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - Bytes_Sent \ - CPU_Load \ - Constraint \ - Group \ - Memory_Usage \ - Message_Queue_Size \ - Num_Threads - -## Makefile.MC_Test_Utilities.am - -noinst_LTLIBRARIES = libMC_Test_Utilities.la - -libMC_Test_Utilities_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DMC_TEST_UTILITIES_BUILD_DLL - -libMC_Test_Utilities_la_SOURCES = \ - MC_Test_Utilities.cpp - -noinst_HEADERS = \ - MC_Test_Utilities.h \ - MC_Test_Utilities_export.h - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Monitor/Memory_Usage/Makefile.am b/ACE/examples/Monitor/Memory_Usage/Makefile.am deleted file mode 100644 index f84c42c5d71..00000000000 --- a/ACE/examples/Monitor/Memory_Usage/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Memory_Usage.am - -if !BUILD_WINCE - -noinst_PROGRAMS = memory_usage - -memory_usage_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -memory_usage_SOURCES = \ - memory_usage.cpp - -memory_usage_LDADD = \ - $(top_builddir)/examples/Monitor/libMC_Test_Utilities.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Monitor/Message_Queue_Size/Makefile.am b/ACE/examples/Monitor/Message_Queue_Size/Makefile.am deleted file mode 100644 index 3f954d69847..00000000000 --- a/ACE/examples/Monitor/Message_Queue_Size/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Message_Queue_Size.am - -if !BUILD_WINCE - -noinst_PROGRAMS = message_queue_size - -message_queue_size_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DENABLE_MONITORS \ - -DENABLE_ACE_MONITORS - -message_queue_size_SOURCES = \ - message_queue_size.cpp - -message_queue_size_LDADD = \ - $(top_builddir)/examples/Monitor/libMC_Test_Utilities.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Monitor/Num_Threads/Makefile.am b/ACE/examples/Monitor/Num_Threads/Makefile.am deleted file mode 100644 index 2adae261109..00000000000 --- a/ACE/examples/Monitor/Num_Threads/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Num_Threads.am - -if !BUILD_WINCE - -noinst_PROGRAMS = num_threads - -num_threads_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -num_threads_SOURCES = \ - num_threads.cpp - -num_threads_LDADD = \ - $(top_builddir)/examples/Monitor/libMC_Test_Utilities.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/NT_Service/Makefile.am b/ACE/examples/NT_Service/Makefile.am deleted file mode 100644 index c52c27430d7..00000000000 --- a/ACE/examples/NT_Service/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.NT_Service.am - -if BUILD_WINREGISTRY -if !BUILD_ACE_FOR_TAO -if !BUILD_WINCE - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -main_SOURCES = \ - main.cpp \ - ntsvc.cpp \ - ntsvc.h - -main_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE -endif !BUILD_ACE_FOR_TAO -endif BUILD_WINREGISTRY - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Naming/Makefile.am b/ACE/examples/Naming/Makefile.am deleted file mode 100644 index a98ffabba50..00000000000 --- a/ACE/examples/Naming/Makefile.am +++ /dev/null @@ -1,94 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Naming_Multiple_Contexts.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += multiple_contexts - -multiple_contexts_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -multiple_contexts_SOURCES = \ - test_multiple_contexts.cpp - -multiple_contexts_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Naming_Non_Existent.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += non_existent - -non_existent_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -non_existent_SOURCES = \ - test_non_existent.cpp - -non_existent_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Naming_Open.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += open - -open_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -open_SOURCES = \ - test_open.cpp - -open_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Naming_Writers.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += writers - -writers_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -writers_SOURCES = \ - test_writers.cpp - -writers_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/OS/Makefile.am b/ACE/examples/OS/Makefile.am deleted file mode 100644 index 7547a62a438..00000000000 --- a/ACE/examples/OS/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Process - diff --git a/ACE/examples/OS/Process/Makefile.am b/ACE/examples/OS/Process/Makefile.am deleted file mode 100644 index 70dec285bde..00000000000 --- a/ACE/examples/OS/Process/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.OS_Process_Imore.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += imore - -imore_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -imore_SOURCES = \ - imore.cpp - -imore_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.OS_Process_Process.am - -noinst_PROGRAMS += process - -process_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -process_SOURCES = \ - process.cpp - -process_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/OS/Process/README b/ACE/examples/OS/Process/README index c22757eb73f..62df0c1698b 100644 --- a/ACE/examples/OS/Process/README +++ b/ACE/examples/OS/Process/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains two examples: <imore> and <process>. They show how you can play with various features of ACE_Process to create new processes. @@ -19,7 +21,7 @@ portably specify path, command-line arguments, environment variable values. It also allows applications to set the new process' standard handles (stdin, stdout, and stderr). ACE_Process is created with the ACE_Process_Options and can be used to perform operations on the -running process. +running process. Notice that this example uses NT version's UNIX utilities like "DATE.EXE," and "ls.exe." You can find where to get them from diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am deleted file mode 100644 index 28c661913c2..00000000000 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## bin/mwc.pl -type automake -noreldefs -features ssl=1,qos=1 ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.QOS_Change_Receiver_FlowSpec_Receiver.am - -if BUILD_QOS - -noinst_PROGRAMS += receiver - -receiver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -receiver_SOURCES = \ - Fill_ACE_QoS.cpp \ - QoS_Signal_Handler.cpp \ - QoS_Util.cpp \ - Receiver_QoS_Event_Handler.cpp \ - receiver.cpp \ - Fill_ACE_QoS.h \ - QoS_Signal_Handler.h \ - QoS_Util.h \ - Receiver_QoS_Event_Handler.h - -receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_QOS - -## Makefile.QOS_Change_Receiver_FlowSpec_Sender.am - -if BUILD_QOS - -noinst_PROGRAMS += sender - -sender_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -sender_SOURCES = \ - Fill_ACE_QoS.cpp \ - QoS_Signal_Handler.cpp \ - QoS_Util.cpp \ - Sender_QoS_Event_Handler.cpp \ - sender.cpp \ - Fill_ACE_QoS.h \ - QoS_Signal_Handler.h \ - QoS_Util.h \ - Sender_QoS_Event_Handler.h - -sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_QOS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/README b/ACE/examples/QOS/Change_Receiver_FlowSpec/README index 58320ef8def..3ce38205c8c 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/README +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/README @@ -1,6 +1,6 @@ $Id$ -A Regression test for ACE QoS features. +A Regression test for ACE QoS features. --------------------------------------- This test implements a simple Receiver-Sender program that ensures @@ -8,7 +8,7 @@ Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. -In addition it dynamically changes the receiver flow spec which in +In addition it dynamically changes the receiver flow spec which in turn changes the RESV messages sent. @@ -19,11 +19,11 @@ Build Requirements : -------------------- 1. Two Win2K machines. 2. June98 Platform SDK or later. -3. Link with ws2_32.lib +3. Link with ws2_32.lib The test consists of a server (which is the receiver) and a client - (which is the sender). - + (which is the sender). + The receiver is started first (though it is not mandatory) as : server -m merengue.cs.wustl.edu:9091 @@ -60,7 +60,7 @@ On Win2K the user must have administrative access to the machine to run this program. It seems to be a pre-requisite to opening QoS sockets. -The sender and receiver should be run on different Win2K machines. +The sender and receiver should be run on different Win2K machines. The test demonstrates how to GQOS enable an application using the ACE QoS APIs. It concentrates on the use of various ACE QoS APIs and their correctness. @@ -79,8 +79,8 @@ PLATFORM_RAPI_LDFLAGS += -L/project/doc/vishal/rapi/rel4.2a4/rsvpd/ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ -1. Compile ACE with - +1. Compile ACE with + make rapi=1 static_libs_only=1 Static library option is used because the RAPI library that we have @@ -107,7 +107,7 @@ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ sender beguine/6000 [ t 2000000 100000 2000000 512 1024 ] From Macarena: - wait until done with ACE + wait until done with ACE dest udp macarena/5000 <session name> reserve wf [ cl 2000000 100000 2000000 512 1024 ] @@ -118,7 +118,7 @@ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ that rtap session is released on both machines. ------------------------------------------------------------------------------- - + If you run into any problems with this test please contact Vishal Kachroo <vishal@cs.wustl.edu>. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am deleted file mode 100644 index 2622f56728f..00000000000 --- a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## bin/mwc.pl -type automake -noreldefs -features ssl=1,qos=1 ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.QOS_Change_Sender_TSpec_Receiver.am - -if BUILD_QOS - -noinst_PROGRAMS += receiver - -receiver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -receiver_SOURCES = \ - Fill_ACE_QoS.cpp \ - QoS_Signal_Handler.cpp \ - QoS_Util.cpp \ - Receiver_QoS_Event_Handler.cpp \ - receiver.cpp \ - Fill_ACE_QoS.h \ - QoS_Signal_Handler.h \ - QoS_Util.h \ - Receiver_QoS_Event_Handler.h - -receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_QOS - -## Makefile.QOS_Change_Sender_TSpec_Sender.am - -if BUILD_QOS - -noinst_PROGRAMS += sender - -sender_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -sender_SOURCES = \ - Fill_ACE_QoS.cpp \ - QoS_Signal_Handler.cpp \ - QoS_Util.cpp \ - Sender_QoS_Event_Handler.cpp \ - sender.cpp \ - Fill_ACE_QoS.h \ - QoS_Signal_Handler.h \ - QoS_Util.h \ - Sender_QoS_Event_Handler.h - -sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_QOS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/QOS/Change_Sender_TSpec/README b/ACE/examples/QOS/Change_Sender_TSpec/README index a8423774320..75f10545047 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/README +++ b/ACE/examples/QOS/Change_Sender_TSpec/README @@ -1,6 +1,6 @@ $Id$ -A Regression test for ACE QoS features. +A Regression test for ACE QoS features. --------------------------------------- This test implements a simple Receiver-Sender program that ensures @@ -8,7 +8,7 @@ Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. -In addition it dynamically changes the sender TSpec which in turn +In addition it dynamically changes the sender TSpec which in turn changes the PATH messages. ------------------------------------------------------------------------ @@ -18,11 +18,11 @@ Build Requirements : -------------------- 1. Two Win2K machines. 2. June98 Platform SDK or later. -3. Link with ws2_32.lib +3. Link with ws2_32.lib The test consists of a server (which is the receiver) and a client - (which is the sender). - + (which is the sender). + The receiver is started first (though it is not mandatory) as : server -m merengue.cs.wustl.edu:9091 @@ -59,7 +59,7 @@ On Win2K the user must have administrative access to the machine to run this program. It seems to be a pre-requisite to opening QoS sockets. -The sender and receiver should be run on different Win2K machines. +The sender and receiver should be run on different Win2K machines. The test demonstrates how to GQOS enable an application using the ACE QoS APIs. It concentrates on the use of various ACE QoS APIs and their correctness. @@ -78,8 +78,8 @@ PLATFORM_RAPI_LDFLAGS += -L/project/doc/vishal/rapi/rel4.2a4/rsvpd/ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ -1. Compile ACE with - +1. Compile ACE with + make rapi=1 static_libs_only=1 Static library option is used because the RAPI library that we have @@ -106,7 +106,7 @@ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ sender beguine/6000 [ t 2000000 100000 2000000 512 1024 ] From Macarena: - wait until done with ACE + wait until done with ACE dest udp macarena/5000 <session name> reserve wf [ cl 2000000 100000 2000000 512 1024 ] @@ -117,7 +117,7 @@ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ that rtap session is released on both machines. ------------------------------------------------------------------------------- - + If you run into any problems with this test please contact Vishal Kachroo <vishal@cs.wustl.edu>. diff --git a/ACE/examples/QOS/Diffserv/Makefile.am b/ACE/examples/QOS/Diffserv/Makefile.am deleted file mode 100644 index bc8e2240012..00000000000 --- a/ACE/examples/QOS/Diffserv/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## bin/mwc.pl -type automake -noreldefs -features ssl=1,qos=1 ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.QOS_Diffserv_Client.am - -if BUILD_QOS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -client_SOURCES = \ - diffserv_test.cpp - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_QOS - -## Makefile.QOS_Diffserv_Server.am - -if BUILD_QOS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_QOS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/QOS/Diffserv/README b/ACE/examples/QOS/Diffserv/README index 285d514ad12..3b0866a1356 100644 --- a/ACE/examples/QOS/Diffserv/README +++ b/ACE/examples/QOS/Diffserv/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains an example which tests the setting of the Diffserv Codepoint (DSCP) values in the @@ -6,7 +8,7 @@ IP TOS field of a stream of UDP packets. Running the example =================== -(1) On one host, run: +(1) On one host, run: server [UDP port number] If port number is omitted, a default port number of 20002 @@ -29,7 +31,7 @@ Running the example Introduction ============ -In RFC 2474, the Type of Service (TOS) field in +In RFC 2474, the Type of Service (TOS) field in the IP header was renamed the Diffserv (DS) field. The DS field is one octet (8 bits). @@ -98,7 +100,7 @@ RFC 2597, "Assured Forwarding PHB Group", http://www.ietf.org/rfc/rfc2597.txt RFC 3246, "An Expedited Forwarding PHB", http://www.ietf.org/rfc/rfc3246.txt -RFC 3247, "Supplemental Information for the New Definition of the EF PHB", +RFC 3247, "Supplemental Information for the New Definition of the EF PHB", http://www.ietf.org/rfc/rfc3247.txt RFC 3168, "The Addition of Explicit Congestion Notification (ECN) diff --git a/ACE/examples/QOS/Makefile.am b/ACE/examples/QOS/Makefile.am deleted file mode 100644 index 7b2d8a15844..00000000000 --- a/ACE/examples/QOS/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu - -SUBDIRS = \ - Change_Receiver_FlowSpec \ - Change_Sender_TSpec \ - Diffserv \ - Simple - diff --git a/ACE/examples/QOS/Simple/Makefile.am b/ACE/examples/QOS/Simple/Makefile.am deleted file mode 100644 index 1c00ebf8545..00000000000 --- a/ACE/examples/QOS/Simple/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## bin/mwc.pl -type automake -noreldefs -features ssl=1,qos=1 ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.QOS_Simple_Receiver.am - -if BUILD_QOS - -noinst_PROGRAMS += receiver - -receiver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -receiver_SOURCES = \ - Fill_ACE_QoS.cpp \ - QoS_Signal_Handler.cpp \ - QoS_Util.cpp \ - Receiver_QoS_Event_Handler.cpp \ - receiver.cpp \ - Fill_ACE_QoS.h \ - QoS_Signal_Handler.h \ - QoS_Util.h \ - Receiver_QoS_Event_Handler.h - -receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_QOS - -## Makefile.QOS_Simple_Sender.am - -if BUILD_QOS - -noinst_PROGRAMS += sender - -sender_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_QOS - -sender_SOURCES = \ - Fill_ACE_QoS.cpp \ - QoS_Signal_Handler.cpp \ - QoS_Util.cpp \ - Sender_QoS_Event_Handler.cpp \ - sender.cpp \ - Fill_ACE_QoS.h \ - QoS_Signal_Handler.h \ - QoS_Util.h \ - Sender_QoS_Event_Handler.h - -sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_QOS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/QOS/Simple/README b/ACE/examples/QOS/Simple/README index 13255842932..6c084472e3d 100644 --- a/ACE/examples/QOS/Simple/README +++ b/ACE/examples/QOS/Simple/README @@ -1,6 +1,6 @@ -//$Id$ +$Id$ -A Regression test for ACE QoS features. +A Regression test for ACE QoS features. --------------------------------------- This test implements a simple Receiver-Sender program that ensures @@ -16,10 +16,10 @@ Build Requirements : -------------------- 1. Two Win2K machines. 2. June98 Platform SDK or later. -3. Link with ws2_32.lib +3. Link with ws2_32.lib + +The test consists of a receiver and a sender. -The test consists of a receiver and a sender. - The sender is started first (though it is not mandatory) as : sender -m merengue.cs.wustl.edu:9091 -P 10004 @@ -36,7 +36,7 @@ The test consists of a receiver and a sender. The sample Sender is started next as : - receiver -m merengue.cs.wustl.edu:9091 + receiver -m merengue.cs.wustl.edu:9091 -m: specifies the multicast session address that both client and server subscribe to for QoS events. @@ -56,7 +56,7 @@ On Win2K the user must have administrative access to the machine to run this program. It seems to be a pre-requisite to opening QoS sockets. -The sender and receiver should be run on different Win2K machines. +The sender and receiver should be run on different Win2K machines. The test demonstrates how to GQOS enable an application using the ACE QoS APIs. It concentrates on the use of various ACE QoS APIs and their correctness. @@ -75,9 +75,9 @@ PLATFORM_RAPI_LDFLAGS += -L/project/doc/vishal/rapi/rel4.2a4/rsvpd/ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ -1. Compile ACE with - - make rapi=1 +1. Compile ACE with + + make rapi=1 2. Run the RSVP Daemon on two machines: (merengue.cs and macarena.cs) @@ -98,8 +98,8 @@ assuming that RAPI library is installed in /project/doc/vishal/rapi/rel4.2a4/ RESV, PATH and other RSVP messages, run the QoS example, making sure that rtap session is released on both machines. -The test consists of a receiver and a sender. - +The test consists of a receiver and a sender. + The sender is started first (though it is not mandatory) as : sender -m macarena.cs.wustl.edu:9091 -P 10004 @@ -116,7 +116,7 @@ The test consists of a receiver and a sender. The sample Sender is started next as : - receiver -m macarena.cs.wustl.edu:9091 + receiver -m macarena.cs.wustl.edu:9091 -m: specifies the multicast session address that both client and server subscribe to for QoS events. @@ -133,7 +133,7 @@ The sample Sender is started next as : -h: Displays the help on various options. ------------------------------------------------------------------------------- - + If you run into any problems with this test please contact Vishal Kachroo <vishal@cs.wustl.edu>. diff --git a/ACE/examples/README b/ACE/examples/README index 4f2629dfba9..e4fbef96d94 100644 --- a/ACE/examples/README +++ b/ACE/examples/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains a number of examples that illustrate how to use the following ACE library components. If you want to see how to program using ACE, this is the best place to start reading code and @@ -7,71 +9,71 @@ These examples are roughly divided up according to the class categories in ACE. For more information on ACE class categories, please take a look at $ACE_ROOT/ACE-categories. - . ASX - Illustrate various components in the ADAPTIVE Service - eXecutive, which is a user-level implementation of - System V STREAMS written in C++. + . ASX + Illustrate various components in the ADAPTIVE Service + eXecutive, which is a user-level implementation of + System V STREAMS written in C++. - . Connection - Illustrate how the various Acceptor and Connector - components can be used. + . Connection + Illustrate how the various Acceptor and Connector + components can be used. - . IOStream - Illustrate how the ACE IOStreams wrapper works. + . IOStream + Illustrate how the ACE IOStreams wrapper works. - . IPC_SAP - Illustrate the C++ wrappers for Sockets, TLI, UNIX and - Win32 Named Pipes, and UNIX Stream Pipes. + . IPC_SAP + Illustrate the C++ wrappers for Sockets, TLI, UNIX and + Win32 Named Pipes, and UNIX Stream Pipes. - . Log_Msg - Illustrate some of the features of the logging - facility used in ACE to consolidate debugging and - error report. + . Log_Msg + Illustrate some of the features of the logging + facility used in ACE to consolidate debugging and + error report. - . Logger - This is a simple version of a Server Logging Daemon - that illustrates the "bare-bones" usage of the - Reactor. A more sophisticated set of logging examples - are in the $ACE_ROOT/netsvcs/{client,lib,server} - directories. + . Logger + This is a simple version of a Server Logging Daemon + that illustrates the "bare-bones" usage of the + Reactor. A more sophisticated set of logging examples + are in the $ACE_ROOT/netsvcs/{client,lib,server} + directories. - . Mem_Map - Illustrate how the ACE memory-mapped file components - work. + . Mem_Map + Illustrate how the ACE memory-mapped file components + work. - . Misc - Various miscellaneous tests that illustrate how ACE - utility components work. + . Misc + Various miscellaneous tests that illustrate how ACE + utility components work. . NT_Service - Illustrates how to write an NT Service using the - ACE_NT_Service class, and how to insert it and remove it - in the SCM, start it, and stop it, and how to run as a - service. - - . Reactor - Contains many examples of how to utilize the ACE - object-oriented event demultiplexer. - - . Service_Configurator - Illustrates the use of the ACE mechanism for - dynamically configuring communication services. - - . Shared_Malloc - Illustrates the use of ACE wrappers for - sophisticated use of the ACE_Malloc shared - memory components. - - . Shared_Memory - Illustrates the use of simple ACE wrappers for - shared memory and memory mapped file. - - . System_V_IPC - Illustrates how to use the ACE wrappers for System V - IPC (i.e., semphores, shared memory, and message - queues). - - . Threads - Illustrates the use of ACE wrappers for threading - and synchronization. + Illustrates how to write an NT Service using the + ACE_NT_Service class, and how to insert it and remove it + in the SCM, start it, and stop it, and how to run as a + service. + + . Reactor + Contains many examples of how to utilize the ACE + object-oriented event demultiplexer. + + . Service_Configurator + Illustrates the use of the ACE mechanism for + dynamically configuring communication services. + + . Shared_Malloc + Illustrates the use of ACE wrappers for + sophisticated use of the ACE_Malloc shared + memory components. + + . Shared_Memory + Illustrates the use of simple ACE wrappers for + shared memory and memory mapped file. + + . System_V_IPC + Illustrates how to use the ACE wrappers for System V + IPC (i.e., semphores, shared memory, and message + queues). + + . Threads + Illustrates the use of ACE wrappers for threading + and synchronization. diff --git a/ACE/examples/Reactor/Dgram/Makefile.am b/ACE/examples/Reactor/Dgram/Makefile.am deleted file mode 100644 index eb7ba9825aa..00000000000 --- a/ACE/examples/Reactor/Dgram/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Reactor_Dgram.am - -noinst_PROGRAMS = dgram - -dgram_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -dgram_SOURCES = \ - Dgram.cpp - -dgram_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Dgram_CO.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += codgram - -codgram_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -codgram_SOURCES = \ - CODgram.cpp - -codgram_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Reactor/FIFO/Makefile.am b/ACE/examples/Reactor/FIFO/Makefile.am deleted file mode 100644 index 07f8503af79..00000000000 --- a/ACE/examples/Reactor/FIFO/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Reactor_FIFO_Client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Reactor_FIFO_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Reactor/Makefile.am b/ACE/examples/Reactor/Makefile.am deleted file mode 100644 index aced36e2c87..00000000000 --- a/ACE/examples/Reactor/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Dgram \ - FIFO \ - Misc \ - Multicast \ - Ntalker \ - Proactor \ - TP_Reactor \ - WFMO_Reactor - diff --git a/ACE/examples/Reactor/Misc/Makefile.am b/ACE/examples/Reactor/Misc/Makefile.am deleted file mode 100644 index 94afaf14865..00000000000 --- a/ACE/examples/Reactor/Misc/Makefile.am +++ /dev/null @@ -1,146 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Reactor_Misc_Demuxing.am - -noinst_PROGRAMS = demuxing - -demuxing_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -demuxing_SOURCES = \ - test_demuxing.cpp - -demuxing_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Early_Timeouts.am - -noinst_PROGRAMS += early_timeouts - -early_timeouts_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -early_timeouts_SOURCES = \ - test_early_timeouts.cpp - -early_timeouts_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Event_Handler_t.am - -noinst_PROGRAMS += event_handler_t - -event_handler_t_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -event_handler_t_SOURCES = \ - test_event_handler_t.cpp - -event_handler_t_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Notification.am - -noinst_PROGRAMS += notification - -notification_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -notification_SOURCES = \ - notification.cpp - -notification_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Pingpong.am - -noinst_PROGRAMS += pingpong - -pingpong_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -pingpong_SOURCES = \ - pingpong.cpp - -pingpong_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Reactors.am - -noinst_PROGRAMS += reactors - -reactors_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -reactors_SOURCES = \ - test_reactors.cpp - -reactors_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Signals_1.am - -noinst_PROGRAMS += signals_1 - -signals_1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -signals_1_SOURCES = \ - test_signals_1.cpp - -signals_1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Signals_2.am - -noinst_PROGRAMS += signals_2 - -signals_2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -signals_2_SOURCES = \ - test_signals_2.cpp - -signals_2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Misc_Timer_Queue.am - -noinst_PROGRAMS += timer_queue - -timer_queue_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -timer_queue_SOURCES = \ - test_timer_queue.cpp - -timer_queue_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Reactor/Multicast/Makefile.am b/ACE/examples/Reactor/Multicast/Makefile.am deleted file mode 100644 index 0c533d3670e..00000000000 --- a/ACE/examples/Reactor/Multicast/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Reactor_Multicast_Client.am - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - Log_Wrapper.cpp \ - client.cpp \ - Log_Wrapper.h - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Multicast_Server.am - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_SOURCES = \ - Log_Wrapper.cpp \ - server.cpp \ - Log_Wrapper.h - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Reactor/Multicast/README b/ACE/examples/Reactor/Multicast/README index 85f64cc8120..d82ebd059f5 100644 --- a/ACE/examples/Reactor/Multicast/README +++ b/ACE/examples/Reactor/Multicast/README @@ -1,12 +1,14 @@ +$Id$ + The following test illustrates the SOCK Mcast multicast wrappers in conjunction with the Reactor. This test was written by Tim Harrison (harrison@cs.wustl.edu). -To run the server type: +To run the server type: % server & -It will wait for the first message sent to it and then read for 5 seconds. +It will wait for the first message sent to it and then read for 5 seconds. To run the client type any of these: diff --git a/ACE/examples/Reactor/Ntalker/Makefile.am b/ACE/examples/Reactor/Ntalker/Makefile.am deleted file mode 100644 index 8226305413b..00000000000 --- a/ACE/examples/Reactor/Ntalker/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Reactor_Ntalker.am - -noinst_PROGRAMS = ntalker - -ntalker_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ntalker_SOURCES = \ - ntalker.cpp - -ntalker_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Reactor/Ntalker/README b/ACE/examples/Reactor/Ntalker/README index 191cef9256f..2c30fd03014 100644 --- a/ACE/examples/Reactor/Ntalker/README +++ b/ACE/examples/Reactor/Ntalker/README @@ -1,3 +1,5 @@ +$Id$ + This test program illustrates how the ACE datagram multicast feature works. To run the test simply do the following on multiple machines: diff --git a/ACE/examples/Reactor/Proactor/Makefile.am b/ACE/examples/Reactor/Proactor/Makefile.am deleted file mode 100644 index a77fead97ec..00000000000 --- a/ACE/examples/Reactor/Proactor/Makefile.am +++ /dev/null @@ -1,160 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Proactor_Cancel.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_cancel - -test_cancel_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_cancel_SOURCES = \ - test_cancel.cpp \ - test_cancel.h - -test_cancel_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_End_Event_Loops.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_end_event_loop - -test_end_event_loop_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_end_event_loop_SOURCES = \ - test_end_event_loop.cpp \ - test_cancel.h \ - test_proactor.h - -test_end_event_loop_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Multiple_Loops.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_multiple_loops - -test_multiple_loops_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_multiple_loops_SOURCES = \ - test_multiple_loops.cpp \ - test_cancel.h \ - test_proactor.h - -test_multiple_loops_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Post_Completions.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_post_completions - -test_post_completions_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_post_completions_SOURCES = \ - post_completions.cpp \ - test_cancel.h \ - test_proactor.h - -test_post_completions_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Proactor.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_proactor - -test_proactor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_proactor_SOURCES = \ - test_proactor.cpp \ - test_proactor.h - -test_proactor_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Timeout.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_timeout - -test_timeout_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_timeout_SOURCES = \ - test_timeout.cpp \ - test_cancel.h \ - test_proactor.h - -test_timeout_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Udp_Proactor.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_udp_proactor - -test_udp_proactor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_udp_proactor_SOURCES = \ - test_udp_proactor.cpp \ - test_cancel.h \ - test_proactor.h - -test_udp_proactor_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Reactor/Proactor/README b/ACE/examples/Reactor/Proactor/README index 29f2a0b1832..dc8f77a2c3a 100644 --- a/ACE/examples/Reactor/Proactor/README +++ b/ACE/examples/Reactor/Proactor/README @@ -1,33 +1,33 @@ $Id$ -This README file lists all the example applications for the Proactor framework. +This README file lists all the example applications for the Proactor framework. Test/Example Applications for Proactor: ========================================= The following tests are available. - + o $ACE_ROOT/tests/Aio_Platform_Test.cpp : Tests basic limits - pertaining to the POSIX features + pertaining to the POSIX features -o $ACE_ROOT/examples/Reactor/Proactor/test_aiocb.cpp : +o $ACE_ROOT/examples/Reactor/Proactor/test_aiocb.cpp : This is a C++ program for testing the AIOCB (AIO Control Blocks) based completion approach which uses <aio_suspend> for - completion querying. + completion querying. o $ACE_ROOT/examples/Reactor/Proactor/test_aiosig.cpp : This is a C++ program for testing the Signal based completion approach - that uses <sigtimedwait> for completion querying. + that uses <sigtimedwait> for completion querying. o $ACE_ROOT/examples/Reactor/Proactor/test_aiocb_ace.cpp: Portable version of test_aiocb.cpp. (Same as test_aiocb.cpp, but uses ACE_DEBUGs instead of printf's and ACE_Message_Blocks instead - of char*'s. + of char*'s. o $ACE_ROOT/examples/Reactor/Proactor/test_aiosig_ace.cpp: Portable version of test_aiosig.cpp. (Same as test_aiosig.cpp, but uses ACE_DEBUGs instead of printf's and ACE_Message_Blocks instead - of char*'s. + of char*'s. o test_proactor.cpp (with ACE_POSIX_AIOCB_Proactor) : Test for ACE_Proactor which uses AIOCB (AIO Control Blocks) based @@ -43,26 +43,26 @@ o test_proactor.cpp (with ACE_POSIX_SIG_Proactor) : Test for o test_multiple_loops.cpp : This example application shows how to write programs that combine the Proactor and Reactor event loops. This is possible only on WIN32 platform. - + o test_timeout.cpp : Multithreaded application testing the Timers mechanism of the Proactor. o test_timeout_st.cpp : Single-threaded version of test_timeout.cpp. o post_completions.cpp : Tests the completion posting mechanism of - the Proactor. + the Proactor. o test_end_event_loop.cpp : Tests the event loop mechanism of the - Proactor. - + Proactor. + o test_cancel.cpp : Tests <cancel> interface of the Asynch_Operation class. - + Behavior of POSIX AIO of various platforms: ========================================== Sun 5.6 : POSIX4 Real-Time signals implementation is broken in - this platform. + this platform. Only POSIX AIOCB Proactor works in this platform. Therefore, it is not possible to use multiple threads with in the framework. @@ -70,6 +70,6 @@ Sun 5.6 : POSIX4 Real-Time signals implementation is broken in Sun 5.7 : AIOCB and SIG Proactors work fine. LynxOS 3.0.0 : <pthread_sigmask> is not available in this - platform. So, only AIOCB Proactor works here. + platform. So, only AIOCB Proactor works here. diff --git a/ACE/examples/Reactor/README b/ACE/examples/Reactor/README index fefaeeaf317..64f016491ca 100644 --- a/ACE/examples/Reactor/README +++ b/ACE/examples/Reactor/README @@ -1,20 +1,22 @@ +$Id$ + This directory contains subdirectories that test the ACE Reactor and Proactor - . Dgram - Tests the CODgram and Dgram classes with the Reactor. - - . Misc - Various miscellaneous tests of Reactor functionality - (e.g., signals, timers, notification, etc.). + . Dgram + Tests the CODgram and Dgram classes with the Reactor. + + . Misc + Various miscellaneous tests of Reactor functionality + (e.g., signals, timers, notification, etc.). - . Multicast - Tests out the ACE multicast capabilities in conjunction - with the Reactor. + . Multicast + Tests out the ACE multicast capabilities in conjunction + with the Reactor. - . Ntalker - A program that implements a multicast "chat" program. + . Ntalker + A program that implements a multicast "chat" program. - . Proactor - A program that illustrates the "Proactive" version of - the Reactor + . Proactor + A program that illustrates the "Proactive" version of + the Reactor diff --git a/ACE/examples/Reactor/TP_Reactor/Makefile.am b/ACE/examples/Reactor/TP_Reactor/Makefile.am deleted file mode 100644 index 17eda0d0046..00000000000 --- a/ACE/examples/Reactor/TP_Reactor/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.TP_Reactor_Client.am - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - AcceptHandler.h \ - ReadHandler.h \ - common.h - -client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TP_Reactor_Server.am - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_SOURCES = \ - AcceptHandler.cpp \ - ReadHandler.cpp \ - server.cpp \ - AcceptHandler.h \ - ReadHandler.h - -server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Reactor/TP_Reactor/README b/ACE/examples/Reactor/TP_Reactor/README index 32fbc15aca9..3d022bce91d 100644 --- a/ACE/examples/Reactor/TP_Reactor/README +++ b/ACE/examples/Reactor/TP_Reactor/README @@ -1,3 +1,5 @@ +$Id$ + ACE reactor demonstration ========================= diff --git a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am deleted file mode 100644 index c844b6654bd..00000000000 --- a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am +++ /dev/null @@ -1,324 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.WFMO_Reactor_APC.am - -if BUILD_WFMO -if !BUILD_WINCE - -noinst_PROGRAMS += apc - -apc_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -apc_SOURCES = \ - APC.cpp - -apc_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Abandoned.am - -if BUILD_WFMO - -noinst_PROGRAMS += abandoned - -abandoned_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -abandoned_SOURCES = \ - Abandoned.cpp - -abandoned_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Console_Input.am - -if BUILD_WFMO - -noinst_PROGRAMS += console_input - -console_input_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -console_input_SOURCES = \ - Console_Input.cpp - -console_input_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Directory_Changes.am - -if BUILD_WFMO - -noinst_PROGRAMS += directory_changes - -directory_changes_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -directory_changes_SOURCES = \ - Directory_Changes.cpp - -directory_changes_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Exceptions.am - -if BUILD_WFMO - -noinst_PROGRAMS += exceptions - -exceptions_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -exceptions_SOURCES = \ - Exceptions.cpp - -exceptions_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Handle_Close.am - -if BUILD_WFMO - -noinst_PROGRAMS += handle_close - -handle_close_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -handle_close_SOURCES = \ - Handle_Close.cpp - -handle_close_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Multithreading.am - -if BUILD_WFMO - -noinst_PROGRAMS += multithreading - -multithreading_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -multithreading_SOURCES = \ - Multithreading.cpp - -multithreading_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Network_Events.am - -if BUILD_WFMO - -noinst_PROGRAMS += network_events - -network_events_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -network_events_SOURCES = \ - Network_Events.cpp - -network_events_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Prerun_State_Changes.am - -if BUILD_WFMO - -noinst_PROGRAMS += prerun_state_changes - -prerun_state_changes_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -prerun_state_changes_SOURCES = \ - Prerun_State_Changes.cpp - -prerun_state_changes_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Registration.am - -if BUILD_WFMO - -noinst_PROGRAMS += registration - -registration_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -registration_SOURCES = \ - Registration.cpp - -registration_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Registry_Changes.am - -if BUILD_WFMO -if !BUILD_ACE_FOR_TAO -if !BUILD_WINCE - -noinst_PROGRAMS += registry_changes - -registry_changes_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -registry_changes_SOURCES = \ - Registry_Changes.cpp - -registry_changes_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE -endif !BUILD_ACE_FOR_TAO -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Removals.am - -if BUILD_WFMO - -noinst_PROGRAMS += removals - -removals_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -removals_SOURCES = \ - Removals.cpp - -removals_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Suspended_Removals.am - -if BUILD_WFMO - -noinst_PROGRAMS += suspended_removals - -suspended_removals_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -suspended_removals_SOURCES = \ - Suspended_Removals.cpp - -suspended_removals_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Talker.am - -if BUILD_WFMO -if !BUILD_ACE_FOR_TAO -if !BUILD_WINCE - -noinst_PROGRAMS += talker - -talker_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -talker_SOURCES = \ - Talker.cpp - -talker_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE -endif !BUILD_ACE_FOR_TAO -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Timeouts.am - -if BUILD_WFMO - -noinst_PROGRAMS += timeouts - -timeouts_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -timeouts_SOURCES = \ - Timeouts.cpp - -timeouts_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_WFMO - -## Makefile.WFMO_Reactor_Window_Messages.am - -if BUILD_WFMO -if !BUILD_ACE_FOR_TAO -if !BUILD_WINCE - -noinst_PROGRAMS += window_messages - -window_messages_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -window_messages_SOURCES = \ - Window_Messages.cpp - -window_messages_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_WINCE -endif !BUILD_ACE_FOR_TAO -endif BUILD_WFMO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Registry/Makefile.am b/ACE/examples/Registry/Makefile.am deleted file mode 100644 index 5118f95341c..00000000000 --- a/ACE/examples/Registry/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Registry_Iterator.am - -if BUILD_WINREGISTRY -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += iterator - -iterator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -iterator_SOURCES = \ - test_registry_iterator.cpp - -iterator_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_WINREGISTRY - -## Makefile.Registry_Update.am - -if BUILD_WINREGISTRY -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += update - -update_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -update_SOURCES = \ - test_registry_update.cpp - -update_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_WINREGISTRY - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Semaphores/Makefile.am b/ACE/examples/Semaphores/Makefile.am deleted file mode 100644 index 8fd22824cbd..00000000000 --- a/ACE/examples/Semaphores/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Semaphores_Starter.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += starter - -starter_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -starter_SOURCES = \ - starter.cpp - -starter_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Semaphores_Worker.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += worker - -worker_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -worker_SOURCES = \ - worker.cpp - -worker_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Semaphores/README b/ACE/examples/Semaphores/README index a2133c13e35..6c890ac6d06 100644 --- a/ACE/examples/Semaphores/README +++ b/ACE/examples/Semaphores/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ This is a small example how to use process semaphores. We use it to synchronize between multiple processes and it was used to analyze diff --git a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am deleted file mode 100644 index 3ad9fe59404..00000000000 --- a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - client \ - server - diff --git a/ACE/examples/Service_Configurator/IPC-tests/README b/ACE/examples/Service_Configurator/IPC-tests/README index 6f491296af7..8777fe762ac 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/README +++ b/ACE/examples/Service_Configurator/IPC-tests/README @@ -1,3 +1,5 @@ +$Id$ + This file describes how to invoke the tests in the $ACE_ROOT/examples/Service_Configurator/IPC-test/{client,server} directories. These tests exercise all of the ACE IPC SAP @@ -38,7 +40,7 @@ Svc_Manager object to be initialized with an "argv" argument of "-d -p connection requests from clients. To see how this works do the following: -1. Comment out all the other lines except +1. Comment out all the other lines except static Svc_Manager "-d -p 3911" @@ -49,7 +51,7 @@ following: % ./server_test -d 3. Make another window on the *same* host and cd to the ./client/ - directory + directory 4. Run the ./remote_service_directory_test program as follows: @@ -66,7 +68,7 @@ and activate another service dynamically, perform the following steps: 1. *Without* shutting down the ./server_test program, edit the svc.conf file. Comment out the Svc_Manager line by adding a '#' at the - front, i.e.: + front, i.e.: # static Svc_Manager "-d -p 3911" @@ -83,9 +85,9 @@ and activate another service dynamically, perform the following steps: parameters as follows: % ./remote_service_directory_test -p 3911 -h localhost -r - + The '-r' flag instructs the server to reconfigure itself. - + After reconfiguration, you'll now have a second active service in the address space of the ./server_test daemon. To see this, rerun the remote_service_directory_test command, e.g.: @@ -93,10 +95,10 @@ and activate another service dynamically, perform the following steps: % ./remote_service_directory_test -p 3911 -h localhost You should now see the following output: - + Svc_Manager 3911/tcp # lists all services in the daemon Remote_Brdcast 10001/udp # tests broadcasting - + which indicates that the remote broadcast service is now active. 3. To test the remote broadcast service, run the following program @@ -104,7 +106,7 @@ and activate another service dynamically, perform the following steps: % ./broadcast_client_test -p 10001 - This should cause the window running the ./server_test to + This should cause the window running the ./server_test to display the following output: received broadcast datagram from host spare.ics.uci.edu diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am deleted file mode 100644 index be9dce0feff..00000000000 --- a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am +++ /dev/null @@ -1,190 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Svc_Cfg_IPC_Client_Bcast.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += remote_broadcast_test - -remote_broadcast_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -remote_broadcast_test_SOURCES = \ - broadcast_client_test.cpp - -remote_broadcast_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Client_Loc_Dgram.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += local_dgram_test - -local_dgram_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -local_dgram_test_SOURCES = \ - local_dgram_client_test.cpp - -local_dgram_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Client_Loc_Fifo.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += local_fifo_test - -local_fifo_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -local_fifo_test_SOURCES = \ - local_fifo_client_test.cpp - -local_fifo_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Client_Loc_Pipe.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += local_pipe_test - -local_pipe_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -local_pipe_test_SOURCES = \ - local_pipe_client_test.cpp - -local_pipe_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Client_Loc_Spipe.am - -noinst_PROGRAMS += local_spipe_test - -local_spipe_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -local_spipe_test_SOURCES = \ - local_spipe_client_test.cpp - -local_spipe_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Svc_Cfg_IPC_Client_Loc_Stream.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += local_stream_test - -local_stream_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -local_stream_test_SOURCES = \ - local_stream_client_test.cpp - -local_stream_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Client_Rem_Dgram.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += remote_dgram_test - -remote_dgram_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -remote_dgram_test_SOURCES = \ - remote_dgram_client_test.cpp - -remote_dgram_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Client_Rem_Stream.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += remote_stream_test - -remote_stream_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -remote_stream_test_SOURCES = \ - remote_stream_client_test.cpp - -remote_stream_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Client_Rem_Svc_Dir.am - -noinst_PROGRAMS += remote_service_directory_test - -remote_service_directory_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -remote_service_directory_test_SOURCES = \ - remote_service_directory_test.cpp - -remote_service_directory_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Svc_Cfg_IPC_Client_Rem_Thr_Stream.am - -noinst_PROGRAMS += remote_thr_stream_test - -remote_thr_stream_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -remote_thr_stream_test_SOURCES = \ - remote_thr_stream_client_test.cpp - -remote_thr_stream_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am deleted file mode 100644 index fbc788f8cd3..00000000000 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Svc_Cfg_IPC_Server_Lib.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libIPC_Tests_Server.la - -libIPC_Tests_Server_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_SVC_DLL - -libIPC_Tests_Server_la_SOURCES = \ - Handle_Broadcast.cpp \ - Handle_L_CODgram.cpp \ - Handle_L_Dgram.cpp \ - Handle_L_FIFO.cpp \ - Handle_L_Pipe.cpp \ - Handle_L_SPIPE.cpp \ - Handle_L_Stream.cpp \ - Handle_R_Stream.cpp \ - Handle_Thr_Stream.cpp \ - Handle_Timeout.cpp - -noinst_HEADERS = \ - Handle_Broadcast.h \ - Handle_Broadcast.inl \ - Handle_L_CODgram.h \ - Handle_L_CODgram.inl \ - Handle_L_Dgram.h \ - Handle_L_Dgram.inl \ - Handle_L_FIFO.h \ - Handle_L_FIFO.inl \ - Handle_L_Pipe.h \ - Handle_L_Pipe.inl \ - Handle_L_SPIPE.h \ - Handle_L_SPIPE.inl \ - Handle_L_Stream.h \ - Handle_L_Stream.inl \ - Handle_R_Stream.h \ - Handle_R_Stream.inl \ - Handle_Thr_Stream.h \ - Handle_Timeout.h \ - Handle_Timeout.inl - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svc_Cfg_IPC_Server_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = server_test - -server_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -server_test_SOURCES = \ - server_test.cpp \ - Handle_Broadcast.h \ - Handle_Broadcast.inl \ - Handle_L_CODgram.h \ - Handle_L_CODgram.inl \ - Handle_L_Dgram.h \ - Handle_L_Dgram.inl \ - Handle_L_FIFO.h \ - Handle_L_FIFO.inl \ - Handle_L_Pipe.h \ - Handle_L_Pipe.inl \ - Handle_L_SPIPE.h \ - Handle_L_SPIPE.inl \ - Handle_L_Stream.h \ - Handle_L_Stream.inl \ - Handle_R_Dgram.h \ - Handle_R_Dgram.inl \ - Handle_R_Stream.h \ - Handle_R_Stream.inl \ - Handle_Thr_Stream.h \ - Handle_Timeout.h \ - Handle_Timeout.inl - -server_test_LDADD = \ - libIPC_Tests_Server.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Service_Configurator/Makefile.am b/ACE/examples/Service_Configurator/Makefile.am deleted file mode 100644 index 8a3ecc74489..00000000000 --- a/ACE/examples/Service_Configurator/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - IPC-tests \ - Misc - diff --git a/ACE/examples/Service_Configurator/Misc/Makefile.am b/ACE/examples/Service_Configurator/Misc/Makefile.am deleted file mode 100644 index 8006a87957e..00000000000 --- a/ACE/examples/Service_Configurator/Misc/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Service_Configurator_Misc_Timer.am - -noinst_LTLIBRARIES = libTimer.la - -libTimer_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_SVC_DLL - -libTimer_la_SOURCES = \ - Timer_Service.cpp - -noinst_HEADERS = \ - Timer_Service.h - -## Makefile.Service_Configurator_Misc_Main.am - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -main_SOURCES = \ - main.cpp \ - Timer_Service.h - -main_LDADD = \ - libTimer.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Service_Configurator/Misc/README b/ACE/examples/Service_Configurator/Misc/README index c3b22759926..6e2d488594a 100644 --- a/ACE/examples/Service_Configurator/Misc/README +++ b/ACE/examples/Service_Configurator/Misc/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains an example that illustrates how the ACE Service Configurator can configure static and dynamic services, both from the command-line and from a svc.config file. We define several diff --git a/ACE/examples/Shared_Malloc/Makefile.am b/ACE/examples/Shared_Malloc/Makefile.am deleted file mode 100644 index e1f9f4a5ade..00000000000 --- a/ACE/examples/Shared_Malloc/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Shared_Malloc.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += malloc - -malloc_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -malloc_SOURCES = \ - Malloc.cpp \ - Options.cpp \ - test_malloc.cpp \ - Malloc.h \ - Options.h - -malloc_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Shared_Malloc_Multiple.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += multiple - -multiple_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -multiple_SOURCES = \ - Malloc.cpp \ - Options.cpp \ - test_multiple_mallocs.cpp \ - Malloc.h \ - Options.h - -multiple_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Shared_Malloc_Persistence.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += persistence - -persistence_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -persistence_SOURCES = \ - test_persistence.cpp \ - Malloc.h \ - Options.h \ - test_position_independent_malloc.h - -persistence_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Shared_Malloc_Posind.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += posind - -posind_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -posind_SOURCES = \ - Malloc.cpp \ - Options.cpp \ - test_position_independent_malloc.cpp \ - Malloc.h \ - Options.h \ - test_position_independent_malloc.h - -posind_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Shared_Memory/Makefile.am b/ACE/examples/Shared_Memory/Makefile.am deleted file mode 100644 index f7e9517e1dc..00000000000 --- a/ACE/examples/Shared_Memory/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Shared_Memory_MM.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += testmm - -testmm_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -testmm_SOURCES = \ - test_MM.cpp - -testmm_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Shared_Memory_SV.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += testsv - -testsv_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -testsv_SOURCES = \ - test_SV.cpp - -testsv_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Smart_Pointers/Makefile.am b/ACE/examples/Smart_Pointers/Makefile.am deleted file mode 100644 index 88aab9e31d0..00000000000 --- a/ACE/examples/Smart_Pointers/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Smart_Pointers_Gadget.am - -noinst_PROGRAMS = gadget - -gadget_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -gadget_SOURCES = \ - Gadget.cpp \ - Gadget_Factory.cpp \ - Gadget_Impl.cpp \ - Gadget_Part.cpp \ - Gadget_Part_Factory.cpp \ - Gadget_Part_Impl.cpp \ - gadget_test.cpp \ - Gadget.h \ - Gadget_Factory.h \ - Gadget_Impl.h \ - Gadget_Part.h \ - Gadget_Part_Factory.h \ - Gadget_Part_Impl.h - -gadget_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Smart_Pointers_Widget.am - -noinst_PROGRAMS += Widget - -Widget_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Widget_SOURCES = \ - Widget.cpp \ - Widget_Factory.cpp \ - Widget_Impl.cpp \ - Widget_Part.cpp \ - Widget_Part_Factory.cpp \ - Widget_Part_Impl.cpp \ - widget_test.cpp \ - Widget.h \ - Widget_Factory.h \ - Widget_Impl.h \ - Widget_Part.h \ - Widget_Part_Factory.h \ - Widget_Part_Impl.h - -Widget_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Smart_Pointers/README b/ACE/examples/Smart_Pointers/README index a23ea1eb828..78525d31731 100644 --- a/ACE/examples/Smart_Pointers/README +++ b/ACE/examples/Smart_Pointers/README @@ -8,7 +8,7 @@ available in ACE. There are two programs in this example. Each program implements a similar set of classes, but with a different style of using smart -pointers. +pointers. The Widget example is written such that objects may only pass raw pointers between them, and use smart pointers to manage the object diff --git a/ACE/examples/Synch/Makefile.am b/ACE/examples/Synch/Makefile.am deleted file mode 100644 index 7e3243cb3b4..00000000000 --- a/ACE/examples/Synch/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Synch.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = proc_sema - -proc_sema_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -proc_sema_SOURCES = \ - proc_sema.cpp - -proc_sema_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Synch/README b/ACE/examples/Synch/README index 526120f2744..1054e8b81e6 100644 --- a/ACE/examples/Synch/README +++ b/ACE/examples/Synch/README @@ -1,3 +1,5 @@ +$Id$ + This directory currently only contains one example for testing process semaphores. diff --git a/ACE/examples/System_V_IPC/Makefile.am b/ACE/examples/System_V_IPC/Makefile.am deleted file mode 100644 index a505dc9b737..00000000000 --- a/ACE/examples/System_V_IPC/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - SV_Message_Queues \ - SV_Semaphores - diff --git a/ACE/examples/System_V_IPC/README b/ACE/examples/System_V_IPC/README index c5ebde21a60..560e3ec19a4 100644 --- a/ACE/examples/System_V_IPC/README +++ b/ACE/examples/System_V_IPC/README @@ -1,13 +1,15 @@ +$Id$ + This directory contains a number of examples that illustrate how to use the following ACE library components: - . SV_Message_Queues - Illustrates the ACE wrappers for System V Message - Queues. + . SV_Message_Queues + Illustrates the ACE wrappers for System V Message + Queues. - . SV_Semaphores - Illustrates the ACE wrappers for System V Semaphores. + . SV_Semaphores + Illustrates the ACE wrappers for System V Semaphores. - . SV_Shared_Memory - Illustrates the ACE wrappers for System V Shared Memory. + . SV_Shared_Memory + Illustrates the ACE wrappers for System V Shared Memory. diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am deleted file mode 100644 index 8b8ea29e204..00000000000 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SV_Message_Queues_MQ_Client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += mqclient - -mqclient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -mqclient_SOURCES = \ - MQ_Client.cpp \ - test.h - -mqclient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SV_Message_Queues_MQ_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += mqserver - -mqserver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -mqserver_SOURCES = \ - MQ_Server.cpp \ - test.h - -mqserver_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SV_Message_Queues_TMQ_Client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += tmqclient - -tmqclient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tmqclient_SOURCES = \ - TMQ_Client.cpp \ - test.h - -tmqclient_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SV_Message_Queues_TMQ_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += tmqserver - -tmqserver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tmqserver_SOURCES = \ - TMQ_Server.cpp \ - test.h - -tmqserver_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am deleted file mode 100644 index 14fa043d43b..00000000000 --- a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SV_Semaphores_1.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += sem1 - -sem1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -sem1_SOURCES = \ - Semaphores_1.cpp - -sem1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SV_Semaphores_2.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += sem2 - -sem2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -sem2_SOURCES = \ - Semaphores_2.cpp - -sem2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Threads/Makefile.am b/ACE/examples/Threads/Makefile.am deleted file mode 100644 index d9bd5ba8fa5..00000000000 --- a/ACE/examples/Threads/Makefile.am +++ /dev/null @@ -1,430 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Threads_Auto_Event.am - -noinst_PROGRAMS = auto_event - -auto_event_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -auto_event_SOURCES = \ - auto_event.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -auto_event_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Barrier1.am - -noinst_PROGRAMS += barrier1 - -barrier1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -barrier1_SOURCES = \ - barrier1.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -barrier1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Barrier2.am - -noinst_PROGRAMS += barrier2 - -barrier2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -barrier2_SOURCES = \ - barrier2.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -barrier2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Cancel.am - -noinst_PROGRAMS += cancel - -cancel_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -cancel_SOURCES = \ - cancel.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -cancel_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Future1.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += future1 - -future1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -future1_SOURCES = \ - future1.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -future1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Threads_Future2.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += future2 - -future2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -future2_SOURCES = \ - future2.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -future2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Threads_Manual_Event.am - -noinst_PROGRAMS += manual_event - -manual_event_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -manual_event_SOURCES = \ - manual_event.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -manual_event_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Process_Mutex.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += process_mutex - -process_mutex_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -process_mutex_SOURCES = \ - process_mutex.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -process_mutex_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Threads_Process_Semaphore.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += process_semaphore - -process_semaphore_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -process_semaphore_SOURCES = \ - process_semaphore.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -process_semaphore_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Threads_Reader_Writer.am - -noinst_PROGRAMS += reader_writer - -reader_writer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -reader_writer_SOURCES = \ - reader_writer.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -reader_writer_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Recursive_Mutex.am - -noinst_PROGRAMS += recursive_mutex - -recursive_mutex_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -recursive_mutex_SOURCES = \ - recursive_mutex.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -recursive_mutex_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Task_Five.am - -noinst_PROGRAMS += task_five - -task_five_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -task_five_SOURCES = \ - task_five.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -task_five_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Task_Four.am - -noinst_PROGRAMS += task_four - -task_four_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -task_four_SOURCES = \ - task_four.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -task_four_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Task_One.am - -noinst_PROGRAMS += task_one - -task_one_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -task_one_SOURCES = \ - task_one.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -task_one_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Task_Three.am - -noinst_PROGRAMS += task_three - -task_three_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -task_three_SOURCES = \ - task_three.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -task_three_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Task_Two.am - -noinst_PROGRAMS += task_two - -task_two_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -task_two_SOURCES = \ - task_two.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -task_two_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Thread_Manager.am - -noinst_PROGRAMS += thread_manager - -thread_manager_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -thread_manager_SOURCES = \ - thread_manager.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -thread_manager_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Thread_Pool.am - -noinst_PROGRAMS += thread_pool - -thread_pool_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -thread_pool_SOURCES = \ - thread_pool.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -thread_pool_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Thread_Specific.am - -noinst_PROGRAMS += thread_specific - -thread_specific_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -thread_specific_SOURCES = \ - thread_specific.cpp \ - thread_specific.h - -thread_specific_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Token.am - -noinst_PROGRAMS += token - -token_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -token_SOURCES = \ - token.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -token_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Tss1.am - -noinst_PROGRAMS += tss1 - -tss1_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tss1_SOURCES = \ - tss1.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -tss1_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Threads_Tss2.am - -noinst_PROGRAMS += tss2 - -tss2_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tss2_SOURCES = \ - tss2.cpp \ - TSS_Data.h \ - TSS_Obj.h \ - TSS_Task.h \ - thread_specific.h - -tss2_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Timer_Queue/Makefile.am b/ACE/examples/Timer_Queue/Makefile.am deleted file mode 100644 index e969ce3129a..00000000000 --- a/ACE/examples/Timer_Queue/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Timer_Queue_Library.am - -noinst_LTLIBRARIES = libtqtd.la - -libtqtd_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_SVC_DLL - -libtqtd_la_SOURCES = \ - Async_Timer_Queue_Test.cpp \ - Driver.cpp \ - Reactor_Timer_Queue_Test.cpp \ - Thread_Timer_Queue_Test.cpp - -noinst_HEADERS = \ - Async_Timer_Queue_Test.h \ - Driver.h \ - Reactor_Timer_Queue_Test.h \ - Thread_Timer_Queue_Test.h - -## Makefile.Timer_Queue_Async.am - -noinst_PROGRAMS = Asynch_Timer_Queue_Test - -Asynch_Timer_Queue_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Asynch_Timer_Queue_Test_SOURCES = \ - main_async.cpp \ - Async_Timer_Queue_Test.h \ - Driver.h \ - Reactor_Timer_Queue_Test.h \ - Thread_Timer_Queue_Test.h - -Asynch_Timer_Queue_Test_LDADD = \ - libtqtd.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timer_Queue_Reactor.am - -noinst_PROGRAMS += Reactor_Timer_Queue_Test - -Reactor_Timer_Queue_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Timer_Queue_Test_SOURCES = \ - main_reactor.cpp \ - Async_Timer_Queue_Test.h \ - Driver.h \ - Reactor_Timer_Queue_Test.h \ - Thread_Timer_Queue_Test.h - -Reactor_Timer_Queue_Test_LDADD = \ - libtqtd.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timer_Queue_Thread.am - -noinst_PROGRAMS += Thread_Timer_Queue_Test - -Thread_Timer_Queue_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Thread_Timer_Queue_Test_SOURCES = \ - main_thread.cpp \ - Async_Timer_Queue_Test.h \ - Driver.h \ - Reactor_Timer_Queue_Test.h \ - Thread_Timer_Queue_Test.h - -Thread_Timer_Queue_Test_LDADD = \ - libtqtd.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Timer_Queue/README b/ACE/examples/Timer_Queue/README index 3cf6ec1b75b..d3bc045b9cc 100644 --- a/ACE/examples/Timer_Queue/README +++ b/ACE/examples/Timer_Queue/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains several examples that illustrate how to use various concurrency mechanisms to schedule and handle timer-based events. All programs are interactive and utilize a common timer queue diff --git a/ACE/examples/Web_Crawler/Makefile.am b/ACE/examples/Web_Crawler/Makefile.am deleted file mode 100644 index e805ea1e807..00000000000 --- a/ACE/examples/Web_Crawler/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Web_Crawler.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -main_SOURCES = \ - Command_Processor.cpp \ - HTTP_URL.cpp \ - Iterators.cpp \ - Mem_Map_Stream.cpp \ - Options.cpp \ - URL.cpp \ - URL_Addr.cpp \ - URL_Status.cpp \ - URL_Visitor.cpp \ - URL_Visitor_Factory.cpp \ - Web_Crawler.cpp \ - main.cpp \ - Command_Processor.h \ - HTTP_URL.h \ - Iterators.h \ - Mem_Map_Stream.h \ - Options.h \ - URL.h \ - URL_Addr.h \ - URL_Status.h \ - URL_Visitor.h \ - URL_Visitor_Factory.h \ - Web_Crawler.h - -main_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Web_Crawler/README b/ACE/examples/Web_Crawler/README index 4f81809173d..2892f3bc367 100644 --- a/ACE/examples/Web_Crawler/README +++ b/ACE/examples/Web_Crawler/README @@ -1,11 +1,13 @@ +$Id$ + Web Crawler Kirthika Parameswaran ----------- The Web Crawler follows the HTTP_1.1 protocol. - + This Crawler crawls in either FIFO or LIFO order over the URLs -now stored in a ACE_Unbounded_Queue. The Command Processor pattern is -used in this example. +now stored in a ACE_Unbounded_Queue. The Command Processor pattern is +used in this example. Also the auto-purging feature where connections are removed from the cache when the process runs out of file descriptors, is added to this example. @@ -16,7 +18,7 @@ Run: --- -> make +> make > main -r -u www.cs.wustl.edu/~kirthika/test.html -o LIFO diff --git a/ACE/html/README b/ACE/html/README index 9b46c0c59b0..a0f44bf54b2 100644 --- a/ACE/html/README +++ b/ACE/html/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ The following directory is a placeholder for the Doxygen generated files. The index.html file only makes sense if you download diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU index 94cea192d09..2ab412828fc 100644 --- a/ACE/include/makeinclude/platform_clang_common.GNU +++ b/ACE/include/makeinclude/platform_clang_common.GNU @@ -3,6 +3,11 @@ # # Common file help turn on/off explicit template instantiation +ifeq ($(openmp),1) +FLAGS_C_CC += -fopenmp +LDFLAGS += -fopenmp +endif + ifeq ($(CXX),insure) # insure does not pass through the -dumpversion option. CXX_FOR_VERSION_TEST ?= g++ diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index 53c5dde5687..d7e4db7355d 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -1,6 +1,11 @@ # -*- Makefile -*- # $Id$ +ifeq ($(openmp),1) +FLAGS_C_CC += -fopenmp +LDFLAGS += -fopenmp +endif + ifeq ($(insure),1) CC = insure CXX = insure diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 318f63b8235..497027bc4dc 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -26,10 +26,10 @@ with_ld = macosx CC ?= gcc CXX ?= g++ - +DCCFLAGS += -g DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) +DLD = $(CXX) +LD = $(CXX) #LIBS += -lstdc++.6 -lSystem -lSystemStubs OCFLAGS += -O2 diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU index cadc4fe5eef..015b986690f 100644 --- a/ACE/include/makeinclude/platform_macosx_iOS.GNU +++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU @@ -17,9 +17,9 @@ ifeq ($(IPHONE_TARGET), SIMULATOR) # crt1.10.7.o is missing under MacOSX 10.7, fallback to 10.6 # until apple provides the missing crt1.10.7.o - CFLAGS += -mmacosx-version-min=10.6 - CXXFLAGS += -mmacosx-version-min=10.6 - LDFLAGS += -mmacosx-version-min=10.6 + CFLAGS += -mmacosx-version-min=10.6 + CCFLAGS += -mmacosx-version-min=10.6 + LDFLAGS += -mmacosx-version-min=10.6 endif ifeq ($(IPHONE_TARGET), HARDWARE) @@ -40,8 +40,8 @@ AR:=$(IPHONE_PLATFORM)/usr/bin/ar RANLIB:=$(IPHONE_PLATFORM)/usr/bin/ranlib DLD = $(CXX) LD = $(CXX) -CFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) -CXXFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) +CFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) +CCFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) ifneq (,$(HOST_ROOT)) TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf @@ -51,6 +51,6 @@ ifneq (,$(HOST_ROOT)) TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) # make sure to use the target compiler, not the cross-compiler # as preprocessor for the cross-compiled idl tools - TAO_IDL_PREPROCESSOR = gcc + TAO_IDL_PREPROCESSOR = clang endif diff --git a/ACE/include/makeinclude/platform_macosx_lion.GNU b/ACE/include/makeinclude/platform_macosx_lion.GNU index d3caf0d4a09..3c2ccecd3e0 100644 --- a/ACE/include/makeinclude/platform_macosx_lion.GNU +++ b/ACE/include/makeinclude/platform_macosx_lion.GNU @@ -17,7 +17,7 @@ ifeq ($(buildbits),universal) LDFLAGS += -arch i386 -arch x86_64 endif -ifneq (,$(buildbits)) +ifeq (,$(buildbits)) FLAGS_C_CC += -m64 LDFLAGS += -m64 endif diff --git a/ACE/netsvcs/Makefile.am b/ACE/netsvcs/Makefile.am deleted file mode 100644 index d4bf0e1c092..00000000000 --- a/ACE/netsvcs/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - lib \ - clients \ - servers - diff --git a/ACE/netsvcs/README b/ACE/netsvcs/README index e9dff4c7dfc..51292b1cb21 100644 --- a/ACE/netsvcs/README +++ b/ACE/netsvcs/README @@ -1,20 +1,22 @@ +$Id$ + This directory contains the ACE network service implementations and sample driver programs for dynamically configuring them into client and server processes. The subdirectories include the following: - . lib -- contains implementations of the ACE network services. - These services include a logging service, a name service, - a distributed locking service, and a distributed time service. - These can be built as shared libraries (i.e., DLLs), which - are then linked into applications either statically or - dynamically. - - . servers -- contains the driver program that links the various - services together, either statically or dynamically, to - form complete server programs. + . lib -- contains implementations of the ACE network services. + These services include a logging service, a name service, + a distributed locking service, and a distributed time service. + These can be built as shared libraries (i.e., DLLs), which + are then linked into applications either statically or + dynamically. + + . servers -- contains the driver program that links the various + services together, either statically or dynamically, to + form complete server programs. - . clients -- contains a number of test programs that illustrate - how to write clients for the various ACE network services. + . clients -- contains a number of test programs that illustrate + how to write clients for the various ACE network services. Please see the ACE-netsvcs.html file for an overview of the various services. diff --git a/ACE/netsvcs/clients/Logger/Makefile.am b/ACE/netsvcs/clients/Logger/Makefile.am deleted file mode 100644 index e5877d7e6f2..00000000000 --- a/ACE/netsvcs/clients/Logger/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.direct_logging.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += direct_logging - -direct_logging_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -direct_logging_SOURCES = \ - direct_logging.cpp - -direct_logging_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.indirect_logging.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += indirect_logging - -indirect_logging_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -indirect_logging_SOURCES = \ - indirect_logging.cpp - -indirect_logging_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/netsvcs/clients/Logger/README b/ACE/netsvcs/clients/Logger/README index 87e324ab0d8..19d9042cd0a 100644 --- a/ACE/netsvcs/clients/Logger/README +++ b/ACE/netsvcs/clients/Logger/README @@ -1,18 +1,20 @@ +$Id$ + This directory contains two sample logging applications that implement and test the ACE distributed logging service. - . indirect_logging.cpp + . indirect_logging.cpp - This program talks to the ACE Client Logging Daemon on - the localhost, which forwards the messages to Server - Logging Daemon. The Client Logging Daemon and Server - Logging Daemon both must be started before you can run - this test. + This program talks to the ACE Client Logging Daemon on + the localhost, which forwards the messages to Server + Logging Daemon. The Client Logging Daemon and Server + Logging Daemon both must be started before you can run + this test. - . direct_logging.cpp + . direct_logging.cpp - This program talks directly to the Server Logging - Daemon. The Server Logging Daemon must be started - before you can run this test. + This program talks directly to the Server Logging + Daemon. The Server Logging Daemon must be started + before you can run this test. To start these daemons, please check out the ../../servers/ directory. diff --git a/ACE/netsvcs/clients/Makefile.am b/ACE/netsvcs/clients/Makefile.am deleted file mode 100644 index 5d7b4bd7e99..00000000000 --- a/ACE/netsvcs/clients/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Logger \ - Naming - diff --git a/ACE/netsvcs/clients/Naming/Client/Makefile.am b/ACE/netsvcs/clients/Naming/Client/Makefile.am deleted file mode 100644 index 7298e846310..00000000000 --- a/ACE/netsvcs/clients/Naming/Client/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Netsvsc_Client_Test_Lib.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libClient_Test.la - -libClient_Test_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_CLIENT_TEST_BUILD_DLL - -libClient_Test_la_SOURCES = \ - Client_Test.cpp - -noinst_HEADERS = \ - Client_Test.h - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Netsvcs_Client_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -main_SOURCES = \ - main.cpp \ - Client_Test.h - -main_LDADD = \ - libClient_Test.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/netsvcs/clients/Naming/Client/README b/ACE/netsvcs/clients/Naming/Client/README index 68e69b6b3bf..6d4aa9c2351 100644 --- a/ACE/netsvcs/clients/Naming/Client/README +++ b/ACE/netsvcs/clients/Naming/Client/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains a test for the ACE_Name_Server library. This test program also illustrates how to use the ACE Service_Config mechanism, which enables the client code to be dynamically linked into @@ -9,11 +11,11 @@ test parameters through the following menu driven interface: Name Service Main Menu ---------------------- *** Using Process Local Database *** - + <P> Use Process Local Database <N> Use Node Local Database <H> Set Remote Name server <host> and <port> - + <B> Bind <key> <value> [<type>] <U> Unbind <key> <R> Rebind <key> <value> [<type>] @@ -25,7 +27,7 @@ test parameters through the following menu driven interface: <D> Complete lookup values matching <pattern> <E> Complete lookup types matching <pattern> -<Q> or ^C (exit) +<Q> or ^C (exit) Initially, the user can select the type of database -- process local, node local, or net local -- from the menu. @@ -34,7 +36,7 @@ node local, or net local -- from the menu. same name as the process and stored in /tmp). <N> uses the node local database (which defaults to /tmp/localnames). <H> uses the net local database by specifying host and port number (by - default this is stored in a file called /tmp/globalnames on the server). + default this is stored in a file called /tmp/globalnames on the server). The user can then create new bindings, delete existing bindings, or rebind bindings: @@ -87,7 +89,7 @@ user wants to use the net local database, the hostname and the port number of the server containing the net local database can be given at "command line" in the svc.conf file, e.g.: -dynamic ACE_Naming_Context Service_Object * libACE.so:_make_ACE_Naming_Context () +dynamic ACE_Naming_Context Service_Object * libACE.so:_make_ACE_Naming_Context () "main -h tango.cs -p 7891" dynamic Name_Server_test Service_Object * .shobj/Client_Test.so:_make_Client_Test () "" @@ -100,7 +102,7 @@ been dynamically linked. Note that you can also use environment variables in the "command line", as follows: -dynamic ACE_Naming_Context Service_Object * libACE.so:_make_ACE_Naming_Context () +dynamic ACE_Naming_Context Service_Object * libACE.so:_make_ACE_Naming_Context () "main -s $DB -p $PORT -h tango" dynamic Name_Server_test Service_Object * .shobj/Client_Test.so:_make_Client_Test () "" diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am deleted file mode 100644 index 0d0cced7cb4..00000000000 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Netsvcs_Dump_Restore_Lib.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libDump_Restore.la - -libDump_Restore_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_SVC_DLL - -libDump_Restore_la_SOURCES = \ - Dump_Restore.cpp - -noinst_HEADERS = \ - Dump_Restore.h - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Netsvcs_Dump_Restore.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -main_SOURCES = \ - main.cpp \ - Dump_Restore.h - -main_LDADD = \ - libDump_Restore.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/README b/ACE/netsvcs/clients/Naming/Dump_Restore/README index 25b1243d03f..d94c4683145 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/README +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/README @@ -1,3 +1,5 @@ +$Id$ + This file describes the usage of the Dump-Restore utility for the ACE Name Server. @@ -7,18 +9,18 @@ a simple ASCII menu-driven interface is provided to the user: Name Service Main Menu ---------------------- *** Using Process Local Database *** - + ** No Input File Specified ** <P> Use Process Local Database <N> Use Node Local Database <H> Set Remote Name server <host> and <port> <F> Set Input File <file name> - + <B> Bind <U> Unbind <R> Rebind <D> Dump <file name> -<Q> or ^C (exit) +<Q> or ^C (exit) Initially, the user can select the type of database from the menu: @@ -29,7 +31,7 @@ Initially, the user can select the type of database from the menu: to /tmp/localnames). <H> uses the net local database by specifying host and port number (by default this is stored in a file called - /tmp/globalnames on the server). + /tmp/globalnames on the server). <F> Sets the name of the input file that will be used by the test application to populate the database. The format of the file should be: @@ -43,7 +45,7 @@ Initially, the user can select the type of database from the menu: . . . - + Note that the type field is optional. However, if no type information is associated with a name binding, a null entry still needs to be present (i.e., type=). @@ -59,7 +61,7 @@ the following: <D> Dump <file name> -- dump the state of the database to <filename>. <Q> or ^C (exit) -- exit gracefully, saving the contents of the Name Server in persistent shared memory. - + Note that the dump file is stored in ASCII with exactly the same format as the input file. Also, one can easily change the test application so that a call to Dump results in the state of the diff --git a/ACE/netsvcs/clients/Naming/Makefile.am b/ACE/netsvcs/clients/Naming/Makefile.am deleted file mode 100644 index ad4d7a0b8af..00000000000 --- a/ACE/netsvcs/clients/Naming/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Client \ - Dump_Restore - diff --git a/ACE/netsvcs/clients/README b/ACE/netsvcs/clients/README index d47c9bfe7ff..3e024ec7627 100644 --- a/ACE/netsvcs/clients/README +++ b/ACE/netsvcs/clients/README @@ -1,8 +1,10 @@ +$Id$ + This directory contains a number of test programs that illustrate how to write clients for the various ACE network services. - . Logger -- client programs that illustrate the ACE logging service. - - . Naming -- client programs that illustrate the ACE name service. - - . Tokens -- client programs that illustrate the ACE token service. + . Logger -- client programs that illustrate the ACE logging service. + + . Naming -- client programs that illustrate the ACE name service. + + . Tokens -- client programs that illustrate the ACE token service. diff --git a/ACE/netsvcs/clients/Tokens/Makefile.am b/ACE/netsvcs/clients/Tokens/Makefile.am deleted file mode 100644 index 37d4b007538..00000000000 --- a/ACE/netsvcs/clients/Tokens/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile for the Token tests -##---------------------------------------------------------------------------- - -## -## Process this file with automake to create Makefile.in -## - -SUBDIRS = \ - collection \ - deadlock \ - invariant \ - manual \ - mutex \ - rw_lock diff --git a/ACE/netsvcs/clients/Tokens/README b/ACE/netsvcs/clients/Tokens/README index 3b6313a1df7..1e2d2e4dee2 100644 --- a/ACE/netsvcs/clients/Tokens/README +++ b/ACE/netsvcs/clients/Tokens/README @@ -1,34 +1,36 @@ +$Id$ + This directory contains a set of tests for the ACE Tokens library. - . mutex + . mutex - Runs a few tests on ACE_Local_Mutex and - ACE_Remote_Mutex. Tests recursive acquisition and - global vs local proxies. + Runs a few tests on ACE_Local_Mutex and + ACE_Remote_Mutex. Tests recursive acquisition and + global vs local proxies. - . rw_locks + . rw_locks - App for testing ACE_Local_RLock, ACE_Local_WLock, - ACE_Remote_RLock, and ACE_Remote_WLock. + App for testing ACE_Local_RLock, ACE_Local_WLock, + ACE_Remote_RLock, and ACE_Remote_WLock. - . deadlock + . deadlock - Tests the deadlock detection algorithm of the token - manager using ACE_Local_Mutex and ACE_Remote_Mutex. + Tests the deadlock detection algorithm of the token + manager using ACE_Local_Mutex and ACE_Remote_Mutex. - . collection + . collection - Tests the ACE_Token_Collection utility. Uses local - and remote tokens and readers/writer locks. + Tests the ACE_Token_Collection utility. Uses local + and remote tokens and readers/writer locks. - . invariant + . invariant - Tests the token Invariant testing utilities. Yes, - this tests a testing utility. + Tests the token Invariant testing utilities. Yes, + this tests a testing utility. - . manual + . manual - Gives users a text-based interactive interface to - local or remote tokens. This is extremely useful for - manually testing the token server and setting up - deadlock scenarios. + Gives users a text-based interactive interface to + local or remote tokens. This is extremely useful for + manually testing the token server and setting up + deadlock scenarios. diff --git a/ACE/netsvcs/clients/Tokens/collection/Makefile.am b/ACE/netsvcs/clients/Tokens/collection/Makefile.am deleted file mode 100644 index d2aa7bf8c1b..00000000000 --- a/ACE/netsvcs/clients/Tokens/collection/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile for repeating token client application -##---------------------------------------------------------------------------- - -## -## Process this file with automake to create Makefile.in -## - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - -noinst_PROGRAMS = \ - collection - -collection_SOURCES = collection.cpp -collection_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/collection/README b/ACE/netsvcs/clients/Tokens/collection/README index 4c25a1f729e..4371cda0ffd 100644 --- a/ACE/netsvcs/clients/Tokens/collection/README +++ b/ACE/netsvcs/clients/Tokens/collection/README @@ -1,3 +1,4 @@ +$Id$ Shows how applications can use the ACE_Token_Collection utility. This example creates three collections and spawns a thread to operate on diff --git a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am deleted file mode 100644 index 5e25ccd0fb3..00000000000 --- a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile for repeating token client application -##---------------------------------------------------------------------------- - -## -## Process this file with automake to create Makefile.in -## - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - -noinst_PROGRAMS = \ - deadlock_detection_test - -deadlock_detection_test_SOURCES = deadlock_detection_test.cpp -deadlock_detection_test_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/deadlock/README b/ACE/netsvcs/clients/Tokens/deadlock/README index 74fffde05cd..829963e64bf 100644 --- a/ACE/netsvcs/clients/Tokens/deadlock/README +++ b/ACE/netsvcs/clients/Tokens/deadlock/README @@ -1,3 +1,4 @@ +$Id$ deadlock_detection_test diff --git a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am deleted file mode 100644 index 83b621b5a42..00000000000 --- a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile for repeating token client application -##---------------------------------------------------------------------------- - -## -## Process this file with automake to create Makefile.in -## - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - -noinst_PROGRAMS = \ - invariant - -invariant_SOURCES = invariant.cpp -invariant_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la - diff --git a/ACE/netsvcs/clients/Tokens/invariant/README b/ACE/netsvcs/clients/Tokens/invariant/README index f078c2d6be4..3c596cb2f3b 100644 --- a/ACE/netsvcs/clients/Tokens/invariant/README +++ b/ACE/netsvcs/clients/Tokens/invariant/README @@ -1,3 +1,4 @@ +$Id$ invariants.cpp tests the ACE Token Invariant utilities. The ACE Token Invariant utilities allow an application to test the correctness of diff --git a/ACE/netsvcs/clients/Tokens/manual/Makefile.am b/ACE/netsvcs/clients/Tokens/manual/Makefile.am deleted file mode 100644 index 4a2cbf60788..00000000000 --- a/ACE/netsvcs/clients/Tokens/manual/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile for repeating token client application -##---------------------------------------------------------------------------- - -## -## Process this file with automake to create Makefile.in -## - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - -noinst_PROGRAMS = \ - manual - -manual_SOURCES = manual.cpp -manual_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations diff --git a/ACE/netsvcs/clients/Tokens/manual/README b/ACE/netsvcs/clients/Tokens/manual/README index 09b9b9a365a..94039cc9d7b 100644 --- a/ACE/netsvcs/clients/Tokens/manual/README +++ b/ACE/netsvcs/clients/Tokens/manual/README @@ -1,3 +1,4 @@ +$Id$ ./manual gives users a text-based interactive interface to local or remote tokens. This is extremely useful for manually testing the diff --git a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am deleted file mode 100644 index 56dd1efccf2..00000000000 --- a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile for repeating token client application -##---------------------------------------------------------------------------- - -## -## Process this file with automake to create Makefile.in -## - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - -noinst_PROGRAMS = \ - test_mutex - -test_mutex_SOURCES = test_mutex.cpp -test_mutex_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la - - diff --git a/ACE/netsvcs/clients/Tokens/mutex/README b/ACE/netsvcs/clients/Tokens/mutex/README index cbd1e9c7d6c..28d9a3b6931 100644 --- a/ACE/netsvcs/clients/Tokens/mutex/README +++ b/ACE/netsvcs/clients/Tokens/mutex/README @@ -1,3 +1,4 @@ +$Id$ test_mutex diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am deleted file mode 100644 index 972d8a64faa..00000000000 --- a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -##---------------------------------------------------------------------------- -## $Id$ -## -## Makefile for repeating token client application -##---------------------------------------------------------------------------- - -## -## Process this file with automake to create Makefile.in -## - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - -noinst_PROGRAMS = \ - rw_locks - -rw_locks_SOURCES = rw_locks.cpp -rw_locks_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la - diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/README b/ACE/netsvcs/clients/Tokens/rw_lock/README index dabc0a3741d..3114b51ba30 100644 --- a/ACE/netsvcs/clients/Tokens/rw_lock/README +++ b/ACE/netsvcs/clients/Tokens/rw_lock/README @@ -1,3 +1,4 @@ +$Id$ test_rw_locks shows how to use ACE_Local_RLock, ACE_Local_WLock, ACE_Remote_RLock, and ACE_Remote_WLock. @@ -20,7 +21,7 @@ for <iterations> acquire read lock for <reads> release read lock - + acquire write lock if (sleep during writes) sleep for 1 second @@ -36,5 +37,5 @@ that no thread holds a reader lock. To run a test, simply type: % ./test_rw_lock -This should show output as described above. +This should show output as described above. diff --git a/ACE/netsvcs/lib/Makefile.am b/ACE/netsvcs/lib/Makefile.am deleted file mode 100644 index ac4d55d60fe..00000000000 --- a/ACE/netsvcs/lib/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.netsvcs.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libnetsvcs.la - -libnetsvcs_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_BUILD_SVC_DLL - -libnetsvcs_la_SOURCES = \ - Base_Optimizer.cpp \ - Client_Logging_Handler.cpp \ - Log_Message_Receiver.cpp \ - Name_Handler.cpp \ - Server_Logging_Handler.cpp \ - Server_Logging_Handler_T.cpp \ - Time_Request_Reply.cpp \ - TS_Clerk_Handler.cpp \ - TS_Server_Handler.cpp \ - Token_Handler.cpp - -noinst_HEADERS = \ - Base_Optimizer.h \ - Client_Logging_Handler.h \ - Log_Message_Receiver.h \ - Name_Handler.h \ - Server_Logging_Handler.h \ - Server_Logging_Handler_T.cpp \ - Server_Logging_Handler_T.h \ - Time_Request_Reply.h \ - TS_Clerk_Handler.h \ - TS_Server_Handler.h \ - Token_Handler.h - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/netsvcs/lib/README b/ACE/netsvcs/lib/README index f624b1758fc..1d454436914 100644 --- a/ACE/netsvcs/lib/README +++ b/ACE/netsvcs/lib/README @@ -1,28 +1,32 @@ +$Id$ + This directory provides a number of network services that utilize the +$Id$ + ACE wrapper features. - . Logging_Strategy -- Controls the output of all services that are - invoked along with the Logging_Strategy service. Please see below for - details on how to control the output. + . Logging_Strategy -- Controls the output of all services that are + invoked along with the Logging_Strategy service. Please see below for + details on how to control the output. - . [Thr_]Server_Logging_Handler.* -- Implements server portion - of the ACE distributed logging service. Both multi-threaded - and single-threaded implementations are provided. + . [Thr_]Server_Logging_Handler.* -- Implements server portion + of the ACE distributed logging service. Both multi-threaded + and single-threaded implementations are provided. - . Client_Logging_Handler.* -- Implements the client portion - of the ACE distributed logging service. + . Client_Logging_Handler.* -- Implements the client portion + of the ACE distributed logging service. - . Name_Handler.* -- Implements a distributed name service that - allows applications to bind, find, and unbind names in - a distributed system. + . Name_Handler.* -- Implements a distributed name service that + allows applications to bind, find, and unbind names in + a distributed system. - . Token_Handler.* -- Implements a distributed token - service that allows applications to acquire and release - locks in a distributed system. + . Token_Handler.* -- Implements a distributed token + service that allows applications to acquire and release + locks in a distributed system. - . Time_Handler.* -- Implements a distributed time service that - allows distributed applications to synchronize their - time. + . Time_Handler.* -- Implements a distributed time service that + allows distributed applications to synchronize their + time. The remainder of this README file explains how these services work. @@ -48,7 +52,7 @@ line arguments that can be given to the Logging_Strategy Service: LOGGER -- Write messages to the local client logger deamon. OSTREAM -- Write messages to the ostream that gets created by specifying a filename (see below) - VERBOSE -- Display messages in a verbose manner + VERBOSE -- Display messages in a verbose manner SILENT -- Do not print messages at all Note: If more than one flag is specified, the flags need to be 'OR'ed @@ -68,7 +72,7 @@ To direct output only to STDERR, specify command line arguments as: "-f STDERR" To direct output to both STDERR and a file called "mylog", specify -command line arguments as: +command line arguments as: "-f STDERR|OSTREAM -s mylog" ==================== Name Service ==================== @@ -88,7 +92,7 @@ consists of : - nameserver_host : hostname where the server process resides - namespace_dir : directory that holds the NameBinding databases - process_name : name of the client process (argv[0]), NameBindings of - a ProcessLocal namespace are stored in file + a ProcessLocal namespace are stored in file "namespace_dir/process_name". NameBindings of NodeGlobal namespace are stored in "namespace_dir/localnames". NameBindings of Net_Local namespace are stored in file @@ -135,7 +139,7 @@ The strategy for all public methods of Naming_Context is common : 1. Transform the format of the arguments to ACE_SString (which is internally used) if necessary. -2. check if work can be done locally : -> call the appropriate local_* method +2. check if work can be done locally : -> call the appropriate local_* method otherwise call the appropriate global_* method. Removing Name_Bindings from the database (either with unbind or @@ -202,7 +206,7 @@ Note that multiple servers can be specified in this manner for the clerk to connect to when it starts up. The server name and the port number need to be concatenated and separated by a ":". In addition, the timeout value can also be specified as a command line argument as -follows: +follows: -t timeout diff --git a/ACE/netsvcs/servers/Makefile.am b/ACE/netsvcs/servers/Makefile.am deleted file mode 100644 index 576581b8be5..00000000000 --- a/ACE/netsvcs/servers/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Netsvcs_server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/netsvcs/lib - -main_SOURCES = \ - main.cpp - -main_LDADD = \ - $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/netsvcs/servers/README b/ACE/netsvcs/servers/README index fcab03dc49a..c03be000b3d 100644 --- a/ACE/netsvcs/servers/README +++ b/ACE/netsvcs/servers/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains the driver program that links the various services together, either statically or dynamically, to form complete server programs. @@ -5,16 +7,16 @@ server programs. You can configure the following ACE network services into the driver program by changing how the svc.conf file is setup: - . Logger -- Controls the output of all services that are - invoked along with the Logger service. Please see the README - file in /netsvcs/lib for details on how to control the output. + . Logger -- Controls the output of all services that are + invoked along with the Logger service. Please see the README + file in /netsvcs/lib for details on how to control the output. - . [Thr_]Server_Logging_Handler.* -- Implements server portion - of the ACE distributed logging service. Both multi-threaded - and single-threaded implementations are provided. + . [Thr_]Server_Logging_Handler.* -- Implements server portion + of the ACE distributed logging service. Both multi-threaded + and single-threaded implementations are provided. - . Client_Logging_Handler.* -- Implements the client portion - of the ACE distributed logging service. Note that you + . Client_Logging_Handler.* -- Implements the client portion + of the ACE distributed logging service. Note that you generally will run a netsvc daemon that's configured with *either* the server portion of the logging service or the client portion of the logging service, but not both in @@ -22,14 +24,14 @@ program by changing how the svc.conf file is setup: separate svc.conf files to configure the client logging process and the server logging process independently. - . Name_Handler.* -- Implements a distributed name service that - allows applications to bind, find, and unbind names in - a distributed system. + . Name_Handler.* -- Implements a distributed name service that + allows applications to bind, find, and unbind names in + a distributed system. - . Token_Handler.* -- Implements a distributed token service - that allows distributed applications to acquire and release - locks in a distributed system. + . Token_Handler.* -- Implements a distributed token service + that allows distributed applications to acquire and release + locks in a distributed system. - . Time_Handler.* -- Implements a distributed time service that - allows distributed applications to synchronize their - time. + . Time_Handler.* -- Implements a distributed time service that + allows distributed applications to synchronize their + time. diff --git a/ACE/netsvcs/servers/svc.conf.xml b/ACE/netsvcs/servers/svc.conf.xml index 3519594ce5c..49e58fc75ff 100644 --- a/ACE/netsvcs/servers/svc.conf.xml +++ b/ACE/netsvcs/servers/svc.conf.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!-- Converted from svc.conf by svcconf-convert.pl --> <ACE_Svc_Conf> + <!-- --> + <!-- $Id$ --> + <!-- --> <!-- These are the services that can be linked into ACE. --> <!-- Note that you can append the "netsvcs" with --> <!-- a relative path if you idn't set your LD search path correctly -- --> diff --git a/ACE/performance-tests/Makefile.am b/ACE/performance-tests/Makefile.am deleted file mode 100644 index 8893d7354cb..00000000000 --- a/ACE/performance-tests/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Misc \ - SCTP \ - Server_Concurrency \ - Synch-Benchmarks \ - TCP \ - UDP - diff --git a/ACE/performance-tests/Misc/Makefile.am b/ACE/performance-tests/Misc/Makefile.am deleted file mode 100644 index e454644170b..00000000000 --- a/ACE/performance-tests/Misc/Makefile.am +++ /dev/null @@ -1,157 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Misc_Basic_Perf.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += basic_perf - -basic_perf_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -basic_perf_SOURCES = \ - basic_func.cpp \ - basic_perf.cpp \ - basic_func.h - -basic_perf_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Misc_Childbirth_Time.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += childbirth_time - -childbirth_time_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -childbirth_time_SOURCES = \ - childbirth_time.cpp \ - basic_func.h \ - test_singleton.h - -childbirth_time_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Misc_Context_Switch_Time.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += context_switch_time - -context_switch_time_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -context_switch_time_SOURCES = \ - context_switch_time.cpp \ - basic_func.h \ - test_singleton.h - -context_switch_time_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Misc_Preempt.am - -noinst_PROGRAMS += preempt - -preempt_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -preempt_SOURCES = \ - preempt.cpp \ - basic_func.h \ - test_singleton.h - -preempt_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Misc_Test_Mutex.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_mutex - -test_mutex_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_mutex_SOURCES = \ - test_mutex.cpp \ - basic_func.h \ - test_singleton.h - -test_mutex_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Misc_Test_Naming.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_naming - -test_naming_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_naming_SOURCES = \ - test_naming.cpp \ - basic_func.h \ - test_singleton.h - -test_naming_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Misc_Test_Singleton.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += test_singleton - -test_singleton_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_singleton_SOURCES = \ - test_singleton.cpp \ - test_singleton.h - -test_singleton_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/README b/ACE/performance-tests/README index 36751c061fe..1bf38c73069 100644 --- a/ACE/performance-tests/README +++ b/ACE/performance-tests/README @@ -1,3 +1,5 @@ +$Id$ + The subdirectories in this directory provide a number of benchmarks that use ACE features to determine performance of various concurrency and communication mechanisms. diff --git a/ACE/performance-tests/RPC/README b/ACE/performance-tests/RPC/README index 49b9131733e..f32b59b682e 100644 --- a/ACE/performance-tests/RPC/README +++ b/ACE/performance-tests/RPC/README @@ -1,6 +1,6 @@ # $Id$ - Measure latency over RPC, run as: + Measure latency over RPC, run as: $ server $ client -n <samples> -k host diff --git a/ACE/performance-tests/SCTP/Makefile.am b/ACE/performance-tests/SCTP/Makefile.am deleted file mode 100644 index 31ae3d50200..00000000000 --- a/ACE/performance-tests/SCTP/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SCTP_SOCK_SEQPACK_Association_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_SEQPACK_Association_Test - -SOCK_SEQPACK_Association_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_SEQPACK_Association_Test_SOURCES = \ - SOCK_SEQPACK_Association_Test.cpp \ - Options_Manager.h \ - hist.h - -SOCK_SEQPACK_Association_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SCTP_SOCK_SEQPACK_Clt.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_SEQPACK_clt - -SOCK_SEQPACK_clt_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_SEQPACK_clt_SOURCES = \ - Options_Manager.cpp \ - SOCK_SEQPACK_clt.cpp \ - hist.cpp \ - Options_Manager.h \ - hist.h - -SOCK_SEQPACK_clt_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SCTP_SOCK_SEQPACK_Srv.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_SEQPACK_srv - -SOCK_SEQPACK_srv_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_SEQPACK_srv_SOURCES = \ - Options_Manager.cpp \ - SOCK_SEQPACK_srv.cpp \ - Options_Manager.h - -SOCK_SEQPACK_srv_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SCTP_SOCK_STREAM_Clt.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_STREAM_clt - -SOCK_STREAM_clt_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_STREAM_clt_SOURCES = \ - Options_Manager.cpp \ - SOCK_STREAM_clt.cpp \ - hist.cpp \ - Options_Manager.h \ - hist.h - -SOCK_STREAM_clt_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SCTP_SOCK_STREAM_Srv.am - -noinst_PROGRAMS += SOCK_STREAM_srv - -SOCK_STREAM_srv_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_STREAM_srv_SOURCES = \ - Options_Manager.cpp \ - SOCK_STREAM_srv.cpp \ - Options_Manager.h - -SOCK_STREAM_srv_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/SCTP/README b/ACE/performance-tests/SCTP/README index f6d0ac65954..0561f013826 100644 --- a/ACE/performance-tests/SCTP/README +++ b/ACE/performance-tests/SCTP/README @@ -1,3 +1,5 @@ +$Id$ + This directory provides programs that measure the round trip latency of synchronous octet messaging using ACE wrapper-facades for the SCTP protocol. Currently these programs provide the only example code on @@ -7,7 +9,7 @@ directory. SOCK_STREAM_clt and SOCK_STREAM_srv use the SOCK_STREAM service provided by SCTP via ACE's SOCK_Connector, SOCK_Stream, -SOCK_Association wrapper-facade classes. +SOCK_Association wrapper-facade classes. SOCK_SEQPACK_clt and SOCK_SEQPACK_srv use the SOCK_SEQPACKET service provided by SCTP via ACE's SOCK_SEQPACK_Connector, @@ -26,25 +28,25 @@ LKSCTP implementations. Please read additional README* files listed below. Impl. Type Characteristics Facades ------------------------------------------------------------------------------ OpenSS7 SOCK_SEQPACKET {Connected, ACE_SOCK_SEQPACKET_Acceptor - Reliable, ACE_SOCK_SEQPACKET_Connector + Reliable, ACE_SOCK_SEQPACKET_Connector Messages} ACE_SOCK_SEQPACKET_Association - + OpenSS7 SOCK_STREAM {Connected, ACE_SOCK_Acceptor(IPPROTO_SCTP) Reliable, ACE_SOCK_Connector(IPPROTO_SCTP) Byte Stream} ACE_SOCK_Stream(IPPROTO_SCTP) - + OpenSS7 SOCK_RDM {Connectionless, NOT IMPLEMENTED IN ACE - Reliable, - Messages} - - - LKSCTP SOCK_SEQPACKET {Connectionless, NOT USED IN ACE - UNRELIABLE, - Messages} - + Reliable, + Messages} + + + LKSCTP SOCK_SEQPACKET {Connectionless, NOT USED IN ACE + UNRELIABLE, + Messages} + LKSCTP SOCK_STREAM {Connected, ACE_SOCK_SEQPACKET_Acceptor - Reliable, ACE_SOCK_SEQPACKET_Connector - Messages} ACE_SOCK_SEQPACKET_Association + Reliable, ACE_SOCK_SEQPACKET_Connector + Messages} ACE_SOCK_SEQPACKET_Association ACE_SOCK_Acceptor(IPPROTO_SCTP) ACE_SOCK_Connector(IPPROTO_SCTP) ACE_SOCK_Stream(IPPROTO_SCTP) @@ -63,9 +65,9 @@ located in this directory. README.SCTP_PERF_TEST - Detailed description on how to use the performance tests and the run_spectrum.pl - script contained in this directory. + script contained in this directory. Discussion of the baseline performance - results obtained by LM ATL. + results obtained by LM ATL. THANKS - Documents all the people who contributed to the development of the ACE wrapper-facades for SCTP and the SCIOP (SCTP diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am deleted file mode 100644 index f4369f7ad34..00000000000 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Svr_Conc_Leader_Follower.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += leader_follower - -leader_follower_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -leader_follower_SOURCES = \ - leader_follower.cpp \ - RT_CORBA_Leader_Follower.h - -leader_follower_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svr_Conc_Leader_Follower_RT_CORBA.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += RT_CORBA_Leader_Follower - -RT_CORBA_Leader_Follower_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -RT_CORBA_Leader_Follower_SOURCES = \ - RT_CORBA_Leader_Follower.cpp \ - RT_CORBA_Leader_Follower.h - -RT_CORBA_Leader_Follower_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/Server_Concurrency/Makefile.am b/ACE/performance-tests/Server_Concurrency/Makefile.am deleted file mode 100644 index 5d8482ab96d..00000000000 --- a/ACE/performance-tests/Server_Concurrency/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Leader_Follower \ - Queue_Based_Workers - diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am deleted file mode 100644 index a2573d401c8..00000000000 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Svr_Conc_Queue_Based_Workers.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += workers - -workers_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -workers_SOURCES = \ - workers.cpp \ - RT_CORBA_Workers.h - -workers_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Svr_Conc_Queue_Based_Workers_RTCorba.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += RT_CORBA_Workers - -RT_CORBA_Workers_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -RT_CORBA_Workers_SOURCES = \ - RT_CORBA_Workers.cpp \ - RT_CORBA_Workers.h - -RT_CORBA_Workers_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am deleted file mode 100644 index f5f4158d270..00000000000 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Synch_Benchmarks_Base_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libBase_Test.la - -libBase_Test_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. - -libBase_Test_la_SOURCES = \ - Baseline_Test.cpp \ - base_test.cpp \ - mutex_test.cpp - -../Synch_Lib: - mkdir -p ../Synch_Lib - -libBase_Test_la_DEPENDENCIES = \ - ../Synch_Lib - -libBase_Test_la_LDFLAGS = \ - -L../Synch_Lib - -noinst_HEADERS = \ - Baseline_Test.h \ - Baseline_Test.inl - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/Synch-Benchmarks/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Makefile.am deleted file mode 100644 index 068a35d9c61..00000000000 --- a/ACE/performance-tests/Synch-Benchmarks/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - Synch_Lib \ - Perf_Test \ - Base_Test \ - . - -## Makefile.Synch_Benchmarks.am - -noinst_PROGRAMS = synch_driver - -synch_driver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -synch_driver_SOURCES = \ - synch_driver.cpp - -synch_driver_LDFLAGS = \ - -LSynch_Lib - -synch_driver_LDADD = \ - $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am deleted file mode 100644 index ac4f8fc9a00..00000000000 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Synch_Benchmarks_Perf_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES = libPerf_Test.la - -libPerf_Test_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. - -libPerf_Test_la_SOURCES = \ - Adaptive_Lock_Performance_Test_Base.cpp \ - Benchmark_Performance.cpp \ - Performance_Test.cpp \ - Performance_Test_Options.cpp \ - adaptive_mutex_test.cpp \ - adaptive_recursive_lock_test.cpp \ - adaptive_sema_test.cpp \ - condb_test.cpp \ - conds_test.cpp \ - context_test.cpp \ - guard_test.cpp \ - memory_test.cpp \ - mutex_test.cpp \ - pipe_proc_test.cpp \ - pipe_thr_test.cpp \ - recursive_lock_test.cpp \ - rwrd_test.cpp \ - rwwr_test.cpp \ - sema_test.cpp \ - sysvsema_test.cpp \ - token_test.cpp - -../Synch_Lib: - mkdir -p ../Synch_Lib - -libPerf_Test_la_DEPENDENCIES = \ - ../Synch_Lib - -libPerf_Test_la_LDFLAGS = \ - -L../Synch_Lib - -noinst_HEADERS = \ - Adaptive_Lock_Performance_Test_Base.h \ - Benchmark_Performance.h \ - Performance_Test.h \ - Performance_Test_Options.h \ - Performance_Test_Options.inl - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README index 28f1f160e8a..999b087ad9f 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README @@ -1,22 +1,24 @@ +$Id$ + The files in this directory support controlled benchmarking of the ACE synchronization mechanisms. These mechanisms include: - . Mutexes - . Reader/writer locks - . Condition variables - . Semaphores + . Mutexes + . Reader/writer locks + . Condition variables + . Semaphores . Tokens . Adaptive lockings There are additional tests that measure the memory bandwidth under the following conditions: - . User memory-to-memory copying of data within a single thread - . User memory-to-kernel-to-user memory copying via pipes - between separate processes, as well as between separate - threads in the same process + . User memory-to-memory copying of data within a single thread + . User memory-to-kernel-to-user memory copying via pipes + between separate processes, as well as between separate + threads in the same process There are many options available for this module that can be put into svc.conf files. See the Performance_Test_Options.[Chi] file for more diff --git a/ACE/performance-tests/Synch-Benchmarks/README b/ACE/performance-tests/Synch-Benchmarks/README index c902ecab244..5231a439a11 100644 --- a/ACE/performance-tests/Synch-Benchmarks/README +++ b/ACE/performance-tests/Synch-Benchmarks/README @@ -1,3 +1,5 @@ +$Id$ + This directory contains a program for benchmarking various synchronization and concurrent programming mechanisms in ACE. diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am deleted file mode 100644 index 673ec4a0155..00000000000 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Synch_Lib.am - -noinst_LTLIBRARIES = libSynch_Lib.la - -libSynch_Lib_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DSYNCHLIB_BUILD_DLL - -libSynch_Lib_la_SOURCES = \ - Benchmark_Base.cpp - -noinst_HEADERS = \ - Benchmark_Base.h \ - export_mac.h - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/README b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/README index f17fe39234a..042fa0f7ac1 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/README +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/README @@ -1,3 +1,5 @@ +$Id$ + This subdirectory contains a library that defines the interface used by all benchmarking modules. The library is required by all modules and the synch_driver. If you want to develop your own benchmarking diff --git a/ACE/performance-tests/TCP/Makefile.am b/ACE/performance-tests/TCP/Makefile.am deleted file mode 100644 index 828ad0bbbb5..00000000000 --- a/ACE/performance-tests/TCP/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.TCP.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = tcp_test - -tcp_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -tcp_test_SOURCES = \ - tcp_test.cpp - -tcp_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/TCP/README b/ACE/performance-tests/TCP/README index ac486524c78..284df70c4ba 100644 --- a/ACE/performance-tests/TCP/README +++ b/ACE/performance-tests/TCP/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ udp_test sends TCP messages and records round-trip latency. The client records the latencies and provides nice summary statistics. The server diff --git a/ACE/performance-tests/TTCP/C/README b/ACE/performance-tests/TTCP/C/README index 0da8b3d8010..c06dbcdd189 100644 --- a/ACE/performance-tests/TTCP/C/README +++ b/ACE/performance-tests/TTCP/C/README @@ -1,6 +1,7 @@ +$Id$ - TTCP for c_version and ACE-wrappers - ---------------------------------------------------- + TTCP for c_version and ACE-wrappers + ---------------------------------------------------- This is the super-readme file for the "ttcp" code. This directory contains the C and ACE-wrappers versions of ttcp code. To compile the @@ -8,10 +9,10 @@ code, you have to do the following: 1. You should have ACE installed in your system and configured correctly. (see the reference manual for installation and - configuration procedure) + configuration procedure) 2. Copy this directory (ttcp) in the same directory structure to your - disk space. + disk space. 3. setup the following environment parameters (before compilation stage): ACE_ROOT, LD_LIBRARY_PATH. diff --git a/ACE/performance-tests/UDP/Makefile.am b/ACE/performance-tests/UDP/Makefile.am deleted file mode 100644 index 011333ed50e..00000000000 --- a/ACE/performance-tests/UDP/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.UDP.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = udp_test - -udp_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -udp_test_SOURCES = \ - udp_test.cpp - -udp_test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/performance-tests/UDP/README b/ACE/performance-tests/UDP/README index f2eb3308e1e..e0814859fc6 100644 --- a/ACE/performance-tests/UDP/README +++ b/ACE/performance-tests/UDP/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ udp_test sends UDP packets and records round-trip latency. The client records the latencies and provides nice summary statistics. The server diff --git a/ACE/protocols/Makefile.am b/ACE/protocols/Makefile.am deleted file mode 100644 index 3547585e9d1..00000000000 --- a/ACE/protocols/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu - -SUBDIRS = \ - ace - -if BUILD_EXAMPLES -SUBDIRS += examples -endif - -if BUILD_TESTS -SUBDIRS += tests -endif - diff --git a/ACE/protocols/ace/HTBP/Makefile.am b/ACE/protocols/ace/HTBP/Makefile.am deleted file mode 100644 index bd824576b86..00000000000 --- a/ACE/protocols/ace/HTBP/Makefile.am +++ /dev/null @@ -1,89 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace/HTBP -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.HTBP.am - -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES = libACE_HTBP.la - -libACE_HTBP_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DHTBP_BUILD_DLL - -libACE_HTBP_la_SOURCES = \ - HTBP_Addr.cpp \ - HTBP_Channel.cpp \ - HTBP_Environment.cpp \ - HTBP_Filter.cpp \ - HTBP_Filter_Factory.cpp \ - HTBP_ID_Requestor.cpp \ - HTBP_Inside_Squid_Filter.cpp \ - HTBP_Notifier.cpp \ - HTBP_Outside_Squid_Filter.cpp \ - HTBP_Session.cpp \ - HTBP_Stream.cpp - -libACE_HTBP_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACE_HTBP_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - HTBP_Addr.h \ - HTBP_Channel.h \ - HTBP_Channel.inl \ - HTBP_Environment.h \ - HTBP_Export.h \ - HTBP_Filter.h \ - HTBP_Filter.inl \ - HTBP_Filter_Factory.h \ - HTBP_ID_Requestor.h \ - HTBP_Inside_Squid_Filter.h \ - HTBP_Inside_Squid_Filter.inl \ - HTBP_Macros.h \ - HTBP_Notifier.h \ - HTBP_Outside_Squid_Filter.h \ - HTBP_Outside_Squid_Filter.inl \ - HTBP_Session.h \ - HTBP_Session.inl \ - HTBP_Stream.h - -pkgconfig_DATA = \ - ACE_HTBP.pc - -CLEANFILES = \ - ACE_HTBP.pc - -ACE_HTBP.pc: ${top_builddir}/config.status ${srcdir}/ACE_HTBP.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_HTBP.pc.in - -endif !BUILD_ACE_FOR_TAO - -EXTRA_DIST = \ - ACE_HTBP.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/ace/HTBP/README b/ACE/protocols/ace/HTBP/README index 577aaf15866..04683c3d383 100644 --- a/ACE/protocols/ace/HTBP/README +++ b/ACE/protocols/ace/HTBP/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ This directory contains the HTTP Tunneling, Bidirectional, Protocol implementation. This is a new streaming abstraction layered over an diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.h b/ACE/protocols/ace/INet/ClientRequestHandler.h index 4d8fa7d3f95..3f331168aa6 100644 --- a/ACE/protocols/ace/INet/ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/ClientRequestHandler.h @@ -74,11 +74,7 @@ namespace ACE * @brief * */ -#if (defined(_MSC_VER) || defined(__MINGW32__)) class ACE_INET_Export INetConnectionKey -#else - class INetConnectionKey -#endif : public ConnectionKey { public: diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h index a2c1ea8708c..16f5ca10832 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h @@ -176,11 +176,7 @@ namespace ACE std::istream* put_data = 0); */ -#if (defined(_MSC_VER) || defined(__MINGW32__)) class ACE_INET_Export HttpConnectionKey -#else - class HttpConnectionKey -#endif : public INetConnectionKey { public: diff --git a/ACE/protocols/ace/INet/URLBase.h b/ACE/protocols/ace/INet/URLBase.h index 1e29efa4c33..fff34cfd269 100644 --- a/ACE/protocols/ace/INet/URLBase.h +++ b/ACE/protocols/ace/INet/URLBase.h @@ -130,11 +130,7 @@ namespace ACE ACE_CString path_; public: -#if (defined(_MSC_VER) || defined(__MINGW32__)) class ACE_INET_Export Factory -#else - class Factory -#endif { public: Factory (); diff --git a/ACE/protocols/ace/Makefile.am b/ACE/protocols/ace/Makefile.am deleted file mode 100644 index c476b3583bc..00000000000 --- a/ACE/protocols/ace/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - HTBP \ - RMCast \ - TMCast - diff --git a/ACE/protocols/ace/RMCast/Makefile.am b/ACE/protocols/ace/RMCast/Makefile.am deleted file mode 100644 index 51e73d4041e..00000000000 --- a/ACE/protocols/ace/RMCast/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace/RMCast -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.RMCast.am - -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES = libACE_RMCast.la - -libACE_RMCast_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_RMCAST_BUILD_DLL - -libACE_RMCast_la_SOURCES = \ - Acknowledge.cpp \ - Flow.cpp \ - Fragment.cpp \ - Link.cpp \ - Protocol.cpp \ - Reassemble.cpp \ - Retransmit.cpp \ - Simulator.cpp \ - Socket.cpp \ - Stack.cpp - -libACE_RMCast_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACE_RMCast_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - Acknowledge.h \ - Bits.h \ - Flow.h \ - Fragment.h \ - Link.h \ - Parameters.h \ - Protocol.h \ - RMCast_Export.h \ - Reassemble.h \ - Retransmit.h \ - Simulator.h \ - Socket.h \ - Stack.h - -pkgconfig_DATA = \ - ACE_RMCast.pc - -CLEANFILES = \ - ACE_RMCast.pc - -ACE_RMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_RMCast.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_RMCast.pc.in - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS - -EXTRA_DIST = \ - ACE_RMCast.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/ace/RMCast/README b/ACE/protocols/ace/RMCast/README index 9eda58871b0..174b3f2dd1f 100644 --- a/ACE/protocols/ace/RMCast/README +++ b/ACE/protocols/ace/RMCast/README @@ -1,3 +1,4 @@ +$Id$ Introduction ------------ diff --git a/ACE/protocols/ace/TMCast/Makefile.am b/ACE/protocols/ace/TMCast/Makefile.am deleted file mode 100644 index c524083fd92..00000000000 --- a/ACE/protocols/ace/TMCast/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -includedir = @includedir@/ace/TMCast -pkgconfigdir = @libdir@/pkgconfig - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.TMCast.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -lib_LTLIBRARIES = libACE_TMCast.la - -libACE_TMCast_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DTMCAST_BUILD_DLL - -libACE_TMCast_la_SOURCES = \ - Group.cpp \ - MTQueue.cpp \ - Protocol.cpp - -libACE_TMCast_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ - -libACE_TMCast_la_LIBADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS = \ - Export.hpp \ - FaultDetector.hpp \ - Group.hpp \ - GroupFwd.hpp \ - LinkListener.hpp \ - MTQueue.hpp \ - Messaging.hpp \ - Protocol.hpp \ - TransactionController.hpp - -pkgconfig_DATA = \ - ACE_TMCast.pc - -CLEANFILES = \ - ACE_TMCast.pc - -ACE_TMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_TMCast.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_TMCast.pc.in - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -EXTRA_DIST = \ - ACE_TMCast.pc.in - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/ace/TMCast/README b/ACE/protocols/ace/TMCast/README index 7104be46e30..78b115ffd29 100644 --- a/ACE/protocols/ace/TMCast/README +++ b/ACE/protocols/ace/TMCast/README @@ -1,4 +1,4 @@ - +$Id$ Introduction ------------ @@ -17,7 +17,7 @@ transition [Tn] should satisfy one of the following equations: Mo(Tn-1) = Ma(T) U Mf(T) Mo(Tn-1) = Mc(T) U Mf(T) -Or, in other words, after transaction T has been committed (aborted), +Or, in other words, after transaction T has been committed (aborted), all operational (before transaction T) members are either in the committed (aborted) or failed state. @@ -41,7 +41,7 @@ is one, one is nothing. State of Implementation ----------------------- -The current implementation is in a prototypical stage. The following +The current implementation is in a prototypical stage. The following parts are not implemented or still under development: * Handling of network partitioning (TODO) @@ -54,7 +54,7 @@ parts are not implemented or still under development: Examples -------- -There is a simple example available in examples/TMCast/Member with +There is a simple example available in examples/TMCast/Member with the corresponding README. @@ -62,7 +62,7 @@ Architecture ------------ Primary goals of the protocol are to (1) mask transient failures of the -underlying multicast protocol (or, more precisely, allow to recover +underlying multicast protocol (or, more precisely, allow to recover from transient failures) and (2) exhibit failfast behavior in cases of permanent failures. @@ -82,13 +82,13 @@ struct MemberId char id[MEMBER_ID_LENGTH]; }; -Each payload delivery is part of a transaction. Each transaction is +Each payload delivery is part of a transaction. Each transaction is identified by TransactionId: typedef unsigned short TransactionId; -Each transaction has a status code which identifies its state, as viewed by +Each transaction has a status code which identifies its state, as viewed by a group member: @@ -108,7 +108,7 @@ struct Transaction TransactionStatus status; }; -The outcome of some predefined number of recent transactions is stored +The outcome of some predefined number of recent transactions is stored in TransactionList: typedef Transaction TransactionList[TL_LENGTH]; @@ -127,7 +127,7 @@ struct MessageHeader [Maybe describe each field here.] -A new member joins the group with transaction id 0 and status +A new member joins the group with transaction id 0 and status TS_COMMITTED. Each member sends a periodic 'pulse' messages with some predefined interval @@ -135,10 +135,10 @@ advertising its current view of the group. This includes the state of the current transaction and the history of the recent transactions. -If a member of the group needs a payload delivery it starts a new +If a member of the group needs a payload delivery it starts a new transaction by sending a message with current transaction set to -{++current_id, TS_BEGIN} +{++current_id, TS_BEGIN} and payload appended after the header. @@ -147,22 +147,22 @@ Each member joins a transaction in one of the following ways: * A member that began the transaction joins it 'to commit' (TS_COMMIT) -* A member that received TS_BEGIN joins current transaction 'to commit' +* A member that received TS_BEGIN joins current transaction 'to commit' (TS_COMMIT). * A member that received TS_COMMIT or TS_ABORT but did not receive TS_BEGIN joins current transaction 'to abort' (TS_ABORT). -After a member has joined the transaction it starts participating in the -transaction's voting phase. On this phase members of the group decide the -fate of the transaction. Each member sends a predefined number of messages +After a member has joined the transaction it starts participating in the +transaction's voting phase. On this phase members of the group decide the +fate of the transaction. Each member sends a predefined number of messages where it announces its vote. In between those messages the member is receiving and processing votes from other members and can be influenced by their -'opinion'. +'opinion'. -In their decision-making members follow the principle of the majority. As -the voting progresses (and comes close to an end) members become more and +In their decision-making members follow the principle of the majority. As +the voting progresses (and comes close to an end) members become more and more reluctant to deviate from the decision of the majority. [Maybe add an equation that measures member's willingness to change @@ -176,8 +176,8 @@ In addition, each member builds a 'majority view' of the transaction history (based on transaction_list). If it deviates from the member's own history the member declares itself failed. -Here are some example scenarios of how the protocol behaves in different -situations. Let's say we have three members of the group S, R1, R2. S +Here are some example scenarios of how the protocol behaves in different +situations. Let's say we have three members of the group S, R1, R2. S initiates a transaction. R1 and R2 join it. Scenario 1. (two-step voting) @@ -200,7 +200,7 @@ Scenario 2. (two-step voting) 1. S initiates a transaction (TS_BEGIN) 2a. R1 receives TS_BEGIN, joins for commit -2b. R2 didn't receive TS_BEGIN +2b. R2 didn't receive TS_BEGIN 3a. S announces TS_COMMIT (first vote) 3b. R1 announces TS_COMMIT (first vote) 3c. R2 received R1's TS_COMMIT announces TS_ABORT (first vote) @@ -216,7 +216,7 @@ Scenario 3. (three-step voting) 1. S initiates a transaction (TS_BEGIN) 2a. R1 receives TS_BEGIN, joins for commit -2b. R2 didn't receive TS_BEGIN +2b. R2 didn't receive TS_BEGIN 3a. S announces TS_COMMIT (first vote) 3b. R1 announces TS_COMMIT (first vote) 3c. R2 still didn't receive anything @@ -232,9 +232,9 @@ Scenario 3. (three-step voting) 6a. S announces TS_COMMITTED (end of vote) 6b. R1 announces TS_COMMITTED (end of vote) -6c. R2 discovers that the the majority has declared current transaction +6c. R2 discovers that the the majority has declared current transaction committed and thus declares itself failed. --- +-- Boris Kolpackov <boris@dre.vanderbilt.edu> diff --git a/ACE/protocols/examples/Makefile.am b/ACE/protocols/examples/Makefile.am deleted file mode 100644 index b435d1c3fe2..00000000000 --- a/ACE/protocols/examples/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - RMCast \ - TMCast - diff --git a/ACE/protocols/examples/RMCast/Makefile.am b/ACE/protocols/examples/RMCast/Makefile.am deleted file mode 100644 index ef4f29c4f65..00000000000 --- a/ACE/protocols/examples/RMCast/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Send_Msg - diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am deleted file mode 100644 index eb9a09d771f..00000000000 --- a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Send_Msg_Receiver.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += receiver - -receiver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -receiver_SOURCES = \ - Receiver.cpp \ - Protocol.h - -receiver_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.Send_Msg_Sender.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += sender - -sender_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -sender_SOURCES = \ - Sender.cpp \ - Protocol.h - -sender_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/examples/RMCast/Send_Msg/README b/ACE/protocols/examples/RMCast/Send_Msg/README index b02056bf0cf..82a1c353c9f 100644 --- a/ACE/protocols/examples/RMCast/Send_Msg/README +++ b/ACE/protocols/examples/RMCast/Send_Msg/README @@ -1,3 +1,5 @@ +$Id$ + In this example SENDER sends a number (defined in Protocol.h, 10000 by default) of messages to the multicast group. Each message has an application-level sequence number. RECEIVER tries to receive them diff --git a/ACE/protocols/examples/TMCast/Makefile.am b/ACE/protocols/examples/TMCast/Makefile.am deleted file mode 100644 index 358fc18ef31..00000000000 --- a/ACE/protocols/examples/TMCast/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Member - diff --git a/ACE/protocols/examples/TMCast/Member/Makefile.am b/ACE/protocols/examples/TMCast/Member/Makefile.am deleted file mode 100644 index c5c5c31c34f..00000000000 --- a/ACE/protocols/examples/TMCast/Member/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.Member.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = member - -member_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -member_SOURCES = \ - member.cpp - -member_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/TMCast/libACE_TMCast.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/examples/TMCast/Member/README b/ACE/protocols/examples/TMCast/Member/README index 6a62a107a77..543ffca6ea3 100644 --- a/ACE/protocols/examples/TMCast/Member/README +++ b/ACE/protocols/examples/TMCast/Member/README @@ -1,8 +1,10 @@ -Member example shows how you can build a simple multicast group -using transactional multicast (TMCast). Each member can be either +$Id$ + +Member example shows how you can build a simple multicast group +using transactional multicast (TMCast). Each member can be either a sender or a receiver. -The sender sends small messages to the multicast group with a random +The sender sends small messages to the multicast group with a random wait period in [0, 1] second range. The receiver is simply receiving those messages and prints them out. @@ -12,8 +14,8 @@ $ ./member s sender-1 239.255.0.1:10000 Here the first argument ('s') indicates that new member will be a sender. The second argument ('sender-1') is an id of the new -member (each member of the group should have a unique id). And -the third argument ('239.255.0.1:10000') specifies IPv4 multicast +member (each member of the group should have a unique id). And +the third argument ('239.255.0.1:10000') specifies IPv4 multicast address and port (you can choose you own). To start the receiver you can execute similar command: @@ -23,7 +25,7 @@ $ ./member r receiver-1 239.255.0.1:10000 After you have started both the receiver and the sender you should see a sequence of messages printed by the receiver. -Note, since the group can exist with only one member for a +Note, since the group can exist with only one member for a very short period of time you should start first two members virtually at the same time. See TMCast documentation for more information about why it behaves this way. @@ -32,5 +34,5 @@ You may want to add more than one sender to the group if you want to see how TMCast operates in a totally-ordered mode. --- +-- Boris Kolpackov <boris@dre.vanderbilt.edu> diff --git a/ACE/protocols/tests/HTBP/Makefile.am b/ACE/protocols/tests/HTBP/Makefile.am deleted file mode 100644 index d38309ca6a4..00000000000 --- a/ACE/protocols/tests/HTBP/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - Reactor_Tests \ - Send_Large_Msg \ - Send_Recv_Tests \ - ping - diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am deleted file mode 100644 index 153e1206bb1..00000000000 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Reactor_Tests_Client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -client_SOURCES = \ - client.cpp \ - test_config.h - -client_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Reactor_Tests_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -server_SOURCES = \ - server.cpp \ - test_config.h - -server_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am b/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am deleted file mode 100644 index 870836f47f4..00000000000 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Send_Large_Msg_Client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(top_builddir)/tests/libTest_Output.la \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Send_Large_Msg_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(top_builddir)/tests/libTest_Output.la \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am deleted file mode 100644 index cd211acf455..00000000000 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SendRecv_Test_Client.am - -if BUILD_ACE_UUID -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_UUID - -## Makefile.SendRecv_Test_Server.am - -if BUILD_ACE_UUID -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_UUID - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/tests/HTBP/ping/Makefile.am b/ACE/protocols/tests/HTBP/ping/Makefile.am deleted file mode 100644 index b59b297e535..00000000000 --- a/ACE/protocols/tests/HTBP/ping/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Ping_Client.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Ping_Server.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/protocols/tests/Makefile.am b/ACE/protocols/tests/Makefile.am deleted file mode 100644 index 7bb6fdd829e..00000000000 --- a/ACE/protocols/tests/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - HTBP \ - RMCast - diff --git a/ACE/protocols/tests/RMCast/Makefile.am b/ACE/protocols/tests/RMCast/Makefile.am deleted file mode 100644 index dadabcac905..00000000000 --- a/ACE/protocols/tests/RMCast/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RMCast_Receiver.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += receiver - -receiver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -receiver_SOURCES = \ - Receiver.cpp \ - Protocol.h - -receiver_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.RMCast_Sender.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += sender - -sender_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(ACE_ROOT)/protocols - -sender_SOURCES = \ - Sender.cpp \ - Protocol.h - -sender_LDADD = \ - $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/rpmbuild/README b/ACE/rpmbuild/README index 9acf8cc13a1..1bc2bc38be9 100644 --- a/ACE/rpmbuild/README +++ b/ACE/rpmbuild/README @@ -1,3 +1,5 @@ +$Id$ + Building RPM from source tarball ================================================================ diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 9ae2ab3de72..f8feb93d11e 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,7 +1,7 @@ # Set the version number here. -%define ACEVER 6.0.4 -%define TAOVER 2.0.4 -%define CIAOVER 1.0.4 +%define ACEVER 6.0.5 +%define TAOVER 2.0.5 +%define CIAOVER 1.0.5 # Conditional build # Default values are @@ -855,7 +855,6 @@ cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF inline = 1 EOF %else -%define inline %define inline -D__ACE_NO_INLINE__ -U__ACE_INLINE__ cat >> $ACE_ROOT/include/makeinclude/platform_macros.GNU <<EOF inline = 0 diff --git a/ACE/tests/Makefile.am b/ACE/tests/Makefile.am deleted file mode 100644 index d7e41648e32..00000000000 --- a/ACE/tests/Makefile.am +++ /dev/null @@ -1,3632 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -SUBDIRS = \ - . \ - SSL - - -## Makefile.Test_Output.am - -noinst_SCRIPTS = run_test.pl run_test.lst -dist_check_SCRIPTS = run_test.pl run_test.lst -TESTS = $(noinst_PROGRAMS) -TESTS_ENVIRONMENT = $(srcdir)/run_test.pl -t - - -noinst_LTLIBRARIES = libTest_Output.la - -libTest_Output_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DTEST_OUTPUT_BUILD_DLL - -libTest_Output_la_SOURCES = \ - Test_Output.cpp - -noinst_HEADERS = \ - Test_Output_Export.h \ - test_config.h - -## Makefile.ACE_Init_Test.am - -noinst_PROGRAMS = ACE_Init_Test - -ACE_Init_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ACE_Init_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - ACE_Init_Test.cpp \ - ACE_Init_Test.h - -ACE_Init_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -EXTRA_DIST = \ - ACE_Init_Test.rc - - -## Makefile.ACE_Test.am - -noinst_PROGRAMS += ACE_Test - -ACE_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ACE_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - ACE_Test.cpp - -ACE_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.ARGV_Test.am - -noinst_PROGRAMS += ARGV_Test - -ARGV_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -ARGV_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - ARGV_Test.cpp - -ARGV_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Aio_Platform_Test.am - -noinst_PROGRAMS += Aio_Platform_Test - -Aio_Platform_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Aio_Platform_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Aio_Platform_Test.cpp - -Aio_Platform_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Arg_Shifter_Test.am - -noinst_PROGRAMS += Arg_Shifter_Test - -Arg_Shifter_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Arg_Shifter_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Arg_Shifter_Test.cpp - -Arg_Shifter_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Array_Map_Test.am - -noinst_PROGRAMS += Array_Map_Test - -Array_Map_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Array_Map_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Array_Map_Test.cpp - -Array_Map_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Atomic_Op_Test.am - -noinst_PROGRAMS += Atomic_Op_Test - -Atomic_Op_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Atomic_Op_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Atomic_Op_Test.cpp - -Atomic_Op_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Auto_Event_Test.am - -noinst_PROGRAMS += Auto_Event_Test - -Auto_Event_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Auto_Event_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Auto_Event_Test.cpp - -Auto_Event_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Auto_IncDec_Test.am - -noinst_PROGRAMS += Auto_IncDec_Test - -Auto_IncDec_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Auto_IncDec_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Auto_IncDec_Test.cpp - -Auto_IncDec_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Barrier_Test.am - -noinst_PROGRAMS += Barrier_Test - -Barrier_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Barrier_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Barrier_Test.cpp - -Barrier_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Based_Pointer_Test_Lib.am - -if !BUILD_ACE_FOR_TAO - -noinst_LTLIBRARIES += libBased_Pointer_Test_Lib.la - -libBased_Pointer_Test_Lib_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_SVC_BUILD_DLL - -libBased_Pointer_Test_Lib_la_SOURCES = \ - Based_Pointer_Test_Lib.cpp - -noinst_HEADERS += \ - ACE_Init_Test.h \ - ACE_Init_TestDlg.h \ - ACE_Init_Test_Resource.h \ - ACE_Init_Test_StdAfx.h \ - Bound_Ptr_Test.h \ - Cache_Map_Manager_Test.h \ - Cached_Accept_Conn_Test.h \ - Cached_Conn_Test.h \ - Collection_Test.h \ - Config_Test.h \ - Conn_Test.h \ - DLL_Test.h \ - DLL_Test_Impl.h \ - DLL_Test_Parent.h \ - DLL_Test_Parent_Export.h \ - Framework_Component_DLL.h \ - Framework_Component_DLL_Export.h \ - Framework_Component_Test.h \ - MEM_Stream_Test.h \ - MT_Reactor_Timer_Test.h \ - Malloc_Test.h \ - Map_Test.h \ - Max_Default_Port_Test.h \ - Message_Queue_Test_Ex.h \ - Network_Adapters_Test.h \ - NonBlocking_Conn_Test.h \ - Priority_Reactor_Test.h \ - Proactor_Test.h \ - Process_Strategy_Test.h \ - QtReactor_Test.h \ - RB_Tree_Test.h \ - Reactor_Performance_Test.h \ - Refcounted_Auto_Ptr_Test.h \ - Service_Config_DLL.h \ - Service_Config_DLL_Export.h \ - TP_Reactor_Test.h \ - TSS_Test_Errno.h \ - Task_Ex_Test.h \ - Test_Output_Export.h \ - Thread_Pool_Reactor_Resume_Test.h \ - Thread_Pool_Reactor_Test.h \ - Upgradable_RW_Test.h \ - test_config.h - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Based_Pointer_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Based_Pointer_Test - -Based_Pointer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Based_Pointer_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Based_Pointer_Test.cpp - -Based_Pointer_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Basic_Types_Test.am - -noinst_PROGRAMS += Basic_Types_Test - -Basic_Types_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Basic_Types_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Basic_Types_Test.cpp - -Basic_Types_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bound_Ptr_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Bound_Ptr_Test - -Bound_Ptr_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bound_Ptr_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bound_Ptr_Test.cpp \ - Bound_Ptr_Test.h - -Bound_Ptr_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Buffer_Stream_Test.am - -noinst_PROGRAMS += Buffer_Stream_Test - -Buffer_Stream_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Buffer_Stream_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Buffer_Stream_Test.cpp - -Buffer_Stream_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_1576_Regression_Test.am - -noinst_PROGRAMS += Bug_1576_Regression_Test - -Bug_1576_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_1576_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_1576_Regression_Test.cpp - -Bug_1576_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_1890_Regression_Test.am - -noinst_PROGRAMS += Bug_1890_Regression_Test - -Bug_1890_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_1890_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_1890_Regression_Test.cpp - -Bug_1890_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2368_Regression_Test.am - -noinst_PROGRAMS += Bug_2368_Regression_Test - -Bug_2368_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2368_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2368_Regression_Test.cpp - -Bug_2368_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2497_Regression_Test.am - -noinst_PROGRAMS += Bug_2497_Regression_Test - -Bug_2497_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2497_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2497_Regression_Test.cpp - -Bug_2497_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2540_Regression_Test.am - -noinst_PROGRAMS += Bug_2540_Regression_Test - -Bug_2540_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2540_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2540_Regression_Test.cpp - -Bug_2540_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2653_Regression_Test.am - -noinst_PROGRAMS += Bug_2653_Regression_Test - -Bug_2653_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2653_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2653_Regression_Test.cpp - -Bug_2653_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2659_Regression_Test.am - -noinst_PROGRAMS += Bug_2659_Regression_Test - -Bug_2659_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2659_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2659_Regression_Test.cpp - -Bug_2659_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.CDR_Array_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += CDR_Array_Test - -CDR_Array_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CDR_Array_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - CDR_Array_Test.cpp - -CDR_Array_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.CDR_File_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += CDR_File_Test - -CDR_File_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CDR_File_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - CDR_File_Test.cpp - -CDR_File_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.CDR_Test.am - -noinst_PROGRAMS += CDR_Test - -CDR_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -CDR_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - CDR_Test.cpp - -CDR_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Cache_Map_Manager_Test.am - -noinst_PROGRAMS += Cache_Map_Manager_Test - -Cache_Map_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Cache_Map_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Cache_Map_Manager_Test.cpp \ - Cache_Map_Manager_Test.h - -Cache_Map_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Cached_Accept_Conn_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Cached_Accept_Conn_Test - -Cached_Accept_Conn_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Cached_Accept_Conn_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Cached_Accept_Conn_Test.cpp \ - Cached_Accept_Conn_Test.h - -Cached_Accept_Conn_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Cached_Allocator_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Cached_Allocator_Test - -Cached_Allocator_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Cached_Allocator_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Cached_Allocator_Test.cpp - -Cached_Allocator_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Cached_Conn_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Cached_Conn_Test - -Cached_Conn_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Cached_Conn_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Cached_Conn_Test.cpp \ - Cached_Conn_Test.h - -Cached_Conn_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Capabilities_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Capabilities_Test - -Capabilities_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Capabilities_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Capabilities_Test.cpp - -Capabilities_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Codecs_Test.am - -if BUILD_ACE_CODECS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Codecs_Test - -Codecs_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Codecs_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Codecs_Test.cpp - -Codecs_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_CODECS - -## Makefile.Collection_Test.am - -noinst_PROGRAMS += Collection_Test - -Collection_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Collection_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Collection_Test.cpp \ - Collection_Test.h - -Collection_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Compiler_Features_01_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_01_Test - -Compiler_Features_01_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_01_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_01_Test.cpp - -Compiler_Features_01_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_02_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_02_Test - -Compiler_Features_02_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_02_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_02_Test.cpp - -Compiler_Features_02_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_03_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_03_Test - -Compiler_Features_03_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_03_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_03_Test.cpp - -Compiler_Features_03_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_04_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_04_Test - -Compiler_Features_04_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_04_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_04_Test.cpp - -Compiler_Features_04_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_05_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_05_Test - -Compiler_Features_05_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_05_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_05_Test.cpp - -Compiler_Features_05_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_06_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_06_Test - -Compiler_Features_06_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_06_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_06_Test.cpp - -Compiler_Features_06_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_07_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_07_Test - -Compiler_Features_07_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_07_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_07_Test.cpp - -Compiler_Features_07_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_09_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_09_Test - -Compiler_Features_09_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_09_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_09_Test.cpp - -Compiler_Features_09_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_10_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_10_Test - -Compiler_Features_10_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_10_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_10_Test.cpp - -Compiler_Features_10_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_11_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_11_Test - -Compiler_Features_11_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_11_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_11_Test.cpp - -Compiler_Features_11_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_12_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_12_Test - -Compiler_Features_12_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_12_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_12_Test.cpp - -Compiler_Features_12_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_13_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_13_Test - -Compiler_Features_13_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_13_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_13_Test.cpp - -Compiler_Features_13_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Compiler_Features_14_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Compiler_Features_14_Test - -Compiler_Features_14_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Compiler_Features_14_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Compiler_Features_14_Test.cpp - -Compiler_Features_14_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Config_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Config_Test - -Config_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Config_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Config_Test.cpp \ - Config_Test.h - -Config_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Conn_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Conn_Test - -Conn_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Conn_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Conn_Test.cpp \ - Conn_Test.h - -Conn_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.DLL_Test_Parent_Lib.am - -noinst_LTLIBRARIES += libDLL_Test_Parent.la - -libDLL_Test_Parent_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DDLL_TEST_PARENT_BUILD_DLL - -libDLL_Test_Parent_la_SOURCES = \ - DLL_Test_Parent.cpp - -noinst_HEADERS += \ - DLL_Test_Parent.h \ - DLL_Test_Parent_Export.h \ - test_config.h - -## Makefile.DLL_Test_Lib.am - -noinst_LTLIBRARIES += libDLL_Test_Lib.la - -libDLL_Test_Lib_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_SVC_BUILD_DLL - -libDLL_Test_Lib_la_SOURCES = \ - DLL_Test_Impl.cpp - -noinst_HEADERS += \ - DLL_Test_Impl.h \ - test_config.h - -## Makefile.DLL_Test.am - -noinst_PROGRAMS += DLL_Test - -DLL_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -DLL_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - DLL_Test.cpp \ - DLL_Test.h - -DLL_Test_LDADD = \ - libDLL_Test_Lib.la \ - libDLL_Test_Parent.la \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.DLList_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += DLList_Test - -DLList_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -DLList_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - DLList_Test.cpp - -DLList_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Date_Time_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Date_Time_Test - -Date_Time_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Date_Time_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Date_Time_Test.cpp - -Date_Time_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Dev_Poll_Reactor_Test.am - -noinst_PROGRAMS += Dev_Poll_Reactor_Test - -Dev_Poll_Reactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Dev_Poll_Reactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Dev_Poll_Reactor_Test.cpp - -Dev_Poll_Reactor_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Dirent_Test.am - -noinst_PROGRAMS += Dirent_Test - -Dirent_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Dirent_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Dirent_Test.cpp - -Dirent_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Dynamic_Priority_Test.am - -noinst_PROGRAMS += Dynamic_Priority_Test - -Dynamic_Priority_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Dynamic_Priority_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Dynamic_Priority_Test.cpp - -Dynamic_Priority_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -noinst_PROGRAMS += Dynamic_Test - -Dynamic_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Dynamic_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Dynamic_Test.cpp - -Dynamic_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Enum_Interfaces_Test.am - -noinst_PROGRAMS += Enum_Interfaces_Test - -Enum_Interfaces_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Enum_Interfaces_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Enum_Interfaces_Test.cpp - -Enum_Interfaces_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Env_Value_Test.am - -noinst_PROGRAMS += Env_Value_Test - -Env_Value_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Env_Value_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Env_Value_Test.cpp - -Env_Value_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.FIFO_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += FIFO_Test - -FIFO_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -FIFO_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - FIFO_Test.cpp - -FIFO_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.FlReactor_Test.am - -if BUILD_ACE_FLREACTOR -if BUILD_FL -if BUILD_GL -if BUILD_X11 - -noinst_PROGRAMS += FlReactor_Test - -FlReactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) - -FlReactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - FlReactor_Test.cpp - -FlReactor_Test_LDFLAGS = \ - $(ACE_FLTK_LDFLAGS) - -FlReactor_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_FLTK_LIBS) - -endif BUILD_X11 -endif BUILD_GL -endif BUILD_FL -endif BUILD_ACE_FLREACTOR - -## Makefile.Framework_Component_DLL.am - -noinst_LTLIBRARIES += libFramework_Component_DLL.la - -libFramework_Component_DLL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DFRAMEWORK_COMPONENT_DLL_BUILD_DLL - -libFramework_Component_DLL_la_SOURCES = \ - Framework_Component_DLL.cpp - -noinst_HEADERS += \ - Framework_Component_DLL.h \ - Framework_Component_DLL_Export.h - -## Makefile.Framework_Component_Test.am - -noinst_PROGRAMS += Framework_Component_Test - -Framework_Component_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Framework_Component_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Framework_Component_Test.cpp \ - Framework_Component_Test.h - -Framework_Component_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Future_Set_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Future_Set_Test - -Future_Set_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Future_Set_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Future_Set_Test.cpp - -Future_Set_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Future_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Future_Test - -Future_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Future_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Future_Test.cpp - -Future_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Get_Opt_Test.am - -noinst_PROGRAMS += Get_Opt_Test - -Get_Opt_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Get_Opt_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Get_Opt_Test.cpp - -Get_Opt_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Handle_Set_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Handle_Set_Test - -Handle_Set_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Handle_Set_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Handle_Set_Test.cpp - -Handle_Set_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Hash_Map_Bucket_Iterator_Test.am - -noinst_PROGRAMS += Hash_Map_Bucket_Iterator_Test - -Hash_Map_Bucket_Iterator_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Hash_Map_Bucket_Iterator_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Hash_Map_Bucket_Iterator_Test.cpp - -Hash_Map_Bucket_Iterator_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Hash_Map_Manager_Test.am - -noinst_PROGRAMS += Hash_Map_Manager_Test - -Hash_Map_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Hash_Map_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Hash_Map_Manager_Test.cpp - -Hash_Map_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Hash_Multi_Map_Manager_Test.am - -noinst_PROGRAMS += Hash_Multi_Map_Manager_Test - -Hash_Multi_Map_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Hash_Multi_Map_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Hash_Multi_Map_Manager_Test.cpp - -Hash_Multi_Map_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.High_Res_Timer_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += High_Res_Timer_Test - -High_Res_Timer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -High_Res_Timer_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - High_Res_Timer_Test.cpp - -High_Res_Timer_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.INET_Addr_Test.am - -noinst_PROGRAMS += INET_Addr_Test - -INET_Addr_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -INET_Addr_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - INET_Addr_Test.cpp - -INET_Addr_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.INET_Addr_Test_IPV6.am - -noinst_PROGRAMS += INET_Addr_Test_IPV6 - -INET_Addr_Test_IPV6_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -INET_Addr_Test_IPV6_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - INET_Addr_Test_IPV6.cpp - -INET_Addr_Test_IPV6_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.IOStream_Test.am - -noinst_PROGRAMS += IOStream_Test - -IOStream_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -IOStream_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - IOStream_Test.cpp - -IOStream_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Integer_Truncate_Test.am - -noinst_PROGRAMS += Integer_Truncate_Test - -Integer_Truncate_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Integer_Truncate_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Integer_Truncate_Test.cpp - -Integer_Truncate_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Lazy_Map_Manager_Test.am - -noinst_PROGRAMS += Lazy_Map_Manager_Test - -Lazy_Map_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Lazy_Map_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Lazy_Map_Manager_Test.cpp - -Lazy_Map_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Library_Unload.am - -if !BUILD_WINCE - -noinst_PROGRAMS += UnloadLibACE - -UnloadLibACE_SOURCES = \ - Unload_libACE.cpp \ - ACE_Init_Test.h \ - ACE_Init_TestDlg.h \ - ACE_Init_Test_Resource.h \ - ACE_Init_Test_StdAfx.h \ - Bound_Ptr_Test.h \ - Cache_Map_Manager_Test.h \ - Cached_Accept_Conn_Test.h \ - Cached_Conn_Test.h \ - Collection_Test.h \ - Config_Test.h \ - Conn_Test.h \ - DLL_Test.h \ - DLL_Test_Impl.h \ - DLL_Test_Parent.h \ - DLL_Test_Parent_Export.h \ - Framework_Component_DLL.h \ - Framework_Component_DLL_Export.h \ - Framework_Component_Test.h \ - MEM_Stream_Test.h \ - MT_Reactor_Timer_Test.h \ - Malloc_Test.h \ - Map_Test.h \ - Max_Default_Port_Test.h \ - Message_Queue_Test_Ex.h \ - Network_Adapters_Test.h \ - NonBlocking_Conn_Test.h \ - Priority_Reactor_Test.h \ - Proactor_Test.h \ - Process_Strategy_Test.h \ - QtReactor_Test.h \ - RB_Tree_Test.h \ - Reactor_Performance_Test.h \ - Refcounted_Auto_Ptr_Test.h \ - Service_Config_DLL.h \ - Service_Config_DLL_Export.h \ - TP_Reactor_Test.h \ - TSS_Test_Errno.h \ - Task_Ex_Test.h \ - Test_Output_Export.h \ - Thread_Pool_Reactor_Resume_Test.h \ - Thread_Pool_Reactor_Test.h \ - Upgradable_RW_Test.h \ - test_config.h - -endif !BUILD_WINCE - -## Makefile.Log_Msg_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Log_Msg_Test - -Log_Msg_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Log_Msg_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Log_Msg_Test.cpp - -Log_Msg_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - - -## Makefile.Log_Msg_Backend_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Log_Msg_Backend_Test - -Log_Msg_Backend_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Log_Msg_Backend_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Log_Msg_Backend_Test.cpp - -Log_Msg_Backend_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Logging_Strategy_Test.am - -noinst_PROGRAMS += Logging_Strategy_Test - -Logging_Strategy_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Logging_Strategy_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Logging_Strategy_Test.cpp - -Logging_Strategy_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.MEM_Stream_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += MEM_Stream_Test - -MEM_Stream_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -MEM_Stream_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - MEM_Stream_Test.cpp \ - MEM_Stream_Test.h - -MEM_Stream_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.MM_Shared_Memory_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += MM_Shared_Memory_Test - -MM_Shared_Memory_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -MM_Shared_Memory_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - MM_Shared_Memory_Test.cpp - -MM_Shared_Memory_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.MT_Reactor_Timer_Test.am - -noinst_PROGRAMS += MT_Reactor_Timer_Test - -MT_Reactor_Timer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -MT_Reactor_Timer_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - MT_Reactor_Timer_Test.cpp \ - MT_Reactor_Timer_Test.h - -MT_Reactor_Timer_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.MT_Reactor_Upcall_Test.am - -noinst_PROGRAMS += MT_Reactor_Upcall_Test - -MT_Reactor_Upcall_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -MT_Reactor_Upcall_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - MT_Reactor_Upcall_Test.cpp - -MT_Reactor_Upcall_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.MT_Ref_Counted_Event_Handler_Test.am - -noinst_PROGRAMS += MT_Reference_Counted_Event_Handler_Test - -MT_Reference_Counted_Event_Handler_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -MT_Reference_Counted_Event_Handler_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - MT_Reference_Counted_Event_Handler_Test.cpp - -MT_Reference_Counted_Event_Handler_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.MT_Reference_Counted_Notify_Test.am - -noinst_PROGRAMS += MT_Reference_Counted_Notify_Test - -MT_Reference_Counted_Notify_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -MT_Reference_Counted_Notify_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - MT_Reference_Counted_Notify_Test.cpp - -MT_Reference_Counted_Notify_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.MT_SOCK_Test.am - -noinst_PROGRAMS += MT_SOCK_Test - -MT_SOCK_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -MT_SOCK_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - MT_SOCK_Test.cpp - -MT_SOCK_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Malloc_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Malloc_Test - -Malloc_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Malloc_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Malloc_Test.cpp \ - Malloc_Test.h - -Malloc_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Manual_Event_Test.am - -noinst_PROGRAMS += Manual_Event_Test - -Manual_Event_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Manual_Event_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Manual_Event_Test.cpp - -Manual_Event_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Map_Manager_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Map_Manager_Test - -Map_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Map_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Map_Manager_Test.cpp - -Map_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Map_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Map_Test - -Map_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Map_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Map_Test.cpp \ - Map_Test.h - -Map_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Max_Default_Port_Test.am - -noinst_PROGRAMS += Max_Default_Port_Test - -Max_Default_Port_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Max_Default_Port_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Max_Default_Port_Test.cpp \ - Max_Default_Port_Test.h - -Max_Default_Port_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Max_Default_Port_Test_IPV6.am - -noinst_PROGRAMS += Max_Default_Port_Test_IPV6 - -Max_Default_Port_Test_IPV6_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Max_Default_Port_Test_IPV6_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Max_Default_Port_Test_IPV6.cpp - -Max_Default_Port_Test_IPV6_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Mem_Map_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Mem_Map_Test - -Mem_Map_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Mem_Map_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Mem_Map_Test.cpp - -Mem_Map_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Memcpy_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Memcpy_Test - -Memcpy_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Memcpy_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Memcpy_Test.cpp - -Memcpy_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Message_Block_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Message_Block_Test - -Message_Block_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Message_Block_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Message_Block_Test.cpp - -Message_Block_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Message_Queue_Notifications_Test.am - -noinst_PROGRAMS += Message_Queue_Notifications_Test - -Message_Queue_Notifications_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Message_Queue_Notifications_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Message_Queue_Notifications_Test.cpp - -Message_Queue_Notifications_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Message_Queue_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Message_Queue_Test - -Message_Queue_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Message_Queue_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Message_Queue_Test.cpp - -Message_Queue_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Message_Queue_Test_Ex.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Message_Queue_Test_Ex - -Message_Queue_Test_Ex_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Message_Queue_Test_Ex_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Message_Queue_Test_Ex.cpp \ - Message_Queue_Test_Ex.h - -Message_Queue_Test_Ex_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Multicast_Test.am - -noinst_PROGRAMS += Multicast_Test - -Multicast_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Multicast_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Multicast_Test.cpp - -Multicast_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Multicast_Test_IPV6.am - -noinst_PROGRAMS += Multicast_Test_IPV6 - -Multicast_Test_IPV6_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Multicast_Test_IPV6_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Multicast_Test_IPV6.cpp - -Multicast_Test_IPV6_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Multihomed_INET_Addr_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Multihomed_INET_Addr_Test - -Multihomed_INET_Addr_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Multihomed_INET_Addr_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Multihomed_INET_Addr_Test.cpp - -Multihomed_INET_Addr_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Multihomed_INET_Addr_Test_IPV6.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Multihomed_INET_Addr_Test_IPV6 - -Multihomed_INET_Addr_Test_IPV6_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Multihomed_INET_Addr_Test_IPV6_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Multihomed_INET_Addr_Test_IPV6.cpp - -Multihomed_INET_Addr_Test_IPV6_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Naming_Test.am - -if BUILD_ACE_OTHER -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Naming_Test - -Naming_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Naming_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Naming_Test.cpp - -Naming_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_OTHER - -## Makefile.Network_Adapters_Test.am - -noinst_PROGRAMS += Network_Adapters_Test - -Network_Adapters_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Network_Adapters_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Network_Adapters_Test.cpp \ - Network_Adapters_Test.h - -Network_Adapters_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.New_Fail_Test.am - -noinst_PROGRAMS += New_Fail_Test - -New_Fail_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -New_Fail_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - New_Fail_Test.cpp - -New_Fail_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.NonBlocking_Conn_Test.am - -noinst_PROGRAMS += NonBlocking_Conn_Test - -NonBlocking_Conn_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -NonBlocking_Conn_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - NonBlocking_Conn_Test.cpp \ - NonBlocking_Conn_Test.h - -NonBlocking_Conn_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Notify_Performance_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Notify_Performance_Test - -Notify_Performance_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Notify_Performance_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Notify_Performance_Test.cpp - -Notify_Performance_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.OS_Test.am - -noinst_PROGRAMS += OS_Test - -OS_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -OS_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - OS_Test.cpp - -OS_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Object_Manager_Test.am - -noinst_PROGRAMS += Object_Manager_Test - -Object_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Object_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Object_Manager_Test.cpp - -Object_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Obstack_Test.am - -noinst_PROGRAMS += Obstack_Test - -Obstack_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Obstack_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Obstack_Test.cpp - -Obstack_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.OrdMultiSet_Test.am - -noinst_PROGRAMS += OrdMultiSet_Test - -OrdMultiSet_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -OrdMultiSet_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - OrdMultiSet_Test.cpp - -OrdMultiSet_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Pipe_Test.am - -noinst_PROGRAMS += Pipe_Test - -Pipe_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Pipe_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Pipe_Test.cpp - -Pipe_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Priority_Buffer_Test.am - -noinst_PROGRAMS += Priority_Buffer_Test - -Priority_Buffer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Priority_Buffer_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Priority_Buffer_Test.cpp - -Priority_Buffer_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Priority_Reactor_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Priority_Reactor_Test - -Priority_Reactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Priority_Reactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Priority_Reactor_Test.cpp \ - Priority_Reactor_Test.h - -Priority_Reactor_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Priority_Task_Test.am - -noinst_PROGRAMS += Priority_Task_Test - -Priority_Task_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Priority_Task_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Priority_Task_Test.cpp - -Priority_Task_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Proactor_Scatter_Gather_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Proactor_Scatter_Gather_Test - -Proactor_Scatter_Gather_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Proactor_Scatter_Gather_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Proactor_Scatter_Gather_Test.cpp - -Proactor_Scatter_Gather_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Proactor_Test - -Proactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Proactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Proactor_Test.cpp \ - Proactor_Test.h - -Proactor_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Test_IPV6.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Proactor_Test_IPV6 - -Proactor_Test_IPV6_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Proactor_Test_IPV6_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Proactor_Test_IPV6.cpp - -Proactor_Test_IPV6_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Proactor_Timer_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Proactor_Timer_Test - -Proactor_Timer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Proactor_Timer_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Proactor_Timer_Test.cpp - -Proactor_Timer_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Process_Manager_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Process_Manager_Test - -Process_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Process_Manager_Test.cpp - -Process_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Process_Env_Test.am - -noinst_PROGRAMS += Process_Env_Test - -Process_Env_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Env_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Process_Env_Test.cpp - -Process_Env_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Process_Manual_Event_Test.am - -noinst_PROGRAMS += Process_Manual_Event_Test - -Process_Manual_Event_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Manual_Event_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Process_Manual_Event_Test.cpp - -Process_Manual_Event_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Process_Mutex_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Process_Mutex_Test - -Process_Mutex_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Mutex_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Process_Mutex_Test.cpp - -Process_Mutex_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Process_Semaphore_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Process_Semaphore_Test - -Process_Semaphore_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Semaphore_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Process_Semaphore_Test.cpp - -Process_Semaphore_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Process_Strategy_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Process_Strategy_Test - -Process_Strategy_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Process_Strategy_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Process_Strategy_Test.cpp \ - Process_Strategy_Test.h - -Process_Strategy_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.QtReactor_Test.am - -if BUILD_ACE_QTREACTOR -if BUILD_QT - -BUILT_SOURCES = \ - QtReactor_Test_moc.cpp - -CLEANFILES = \ - QtReactor_Test_moc.cpp - -QtReactor_Test_moc.cpp: $(srcdir)/QtReactor_Test.h - $(QTDIR)/bin/moc $(srcdir)/QtReactor_Test.h -o QtReactor_Test_moc.cpp - -noinst_PROGRAMS += QtReactor_Test - -QtReactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) - -QtReactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - QtReactor_Test.cpp \ - QtReactor_Test_moc.cpp \ - QtReactor_Test.h - -QtReactor_Test_LDFLAGS = \ - $(ACE_QT_LDFLAGS) - -QtReactor_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_QT_LIBS) - -endif BUILD_QT -endif BUILD_ACE_QTREACTOR - -## Makefile.RB_Tree_Test.am - -noinst_PROGRAMS += RB_Tree_Test - -RB_Tree_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -RB_Tree_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - RB_Tree_Test.cpp \ - RB_Tree_Test.h - -RB_Tree_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Dispatch_Order_Test.am - -noinst_PROGRAMS += Reactor_Dispatch_Order_Test - -Reactor_Dispatch_Order_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Dispatch_Order_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Dispatch_Order_Test.cpp - -Reactor_Dispatch_Order_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Exceptions_Test.am - -noinst_PROGRAMS += Reactor_Exceptions_Test - -Reactor_Exceptions_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Exceptions_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Exceptions_Test.cpp - -Reactor_Exceptions_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -noinst_PROGRAMS += Reactor_Fairness_Test - -Reactor_Fairness_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Fairness_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Fairness_Test.cpp - -Reactor_Fairness_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Notification_Queue_Test.am - -noinst_PROGRAMS += Reactor_Notification_Queue_Test - -Reactor_Notification_Queue_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Notification_Queue_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Notification_Queue_Test.cpp - -Reactor_Notification_Queue_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Notify_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Reactor_Notify_Test - -Reactor_Notify_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Notify_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Notify_Test.cpp - -Reactor_Notify_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Reactor_Performance_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Reactor_Performance_Test - -Reactor_Performance_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Performance_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Performance_Test.cpp \ - Reactor_Performance_Test.h - -Reactor_Performance_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Reactor_Registration_Test.am - -noinst_PROGRAMS += Reactor_Registration_Test - -Reactor_Registration_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Registration_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Registration_Test.cpp - -Reactor_Registration_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Remove_Resume_Test.am - -noinst_PROGRAMS += Reactor_Remove_Resume_Test - -Reactor_Remove_Resume_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Remove_Resume_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Remove_Resume_Test.cpp - -Reactor_Remove_Resume_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reactor_Timer_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Reactor_Timer_Test - -Reactor_Timer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactor_Timer_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactor_Timer_Test.cpp - -Reactor_Timer_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Reactors_Test.am - -noinst_PROGRAMS += Reactors_Test - -Reactors_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reactors_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reactors_Test.cpp - -Reactors_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reader_Writer_Test.am - -noinst_PROGRAMS += Reader_Writer_Test - -Reader_Writer_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reader_Writer_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reader_Writer_Test.cpp - -Reader_Writer_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Recursive_Condition_Bug_Test.am - -noinst_PROGRAMS += Recursive_Condition_Bug_Test - -Recursive_Condition_Bug_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Recursive_Condition_Bug_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Recursive_Condition_Bug_Test.cpp - -Recursive_Condition_Bug_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Recursive_Condition_Test.am - -noinst_PROGRAMS += Recursive_Condition_Test - -Recursive_Condition_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Recursive_Condition_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Recursive_Condition_Test.cpp - -Recursive_Condition_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Recursive_Mutex_Test.am - -noinst_PROGRAMS += Recursive_Mutex_Test - -Recursive_Mutex_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Recursive_Mutex_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Recursive_Mutex_Test.cpp - -Recursive_Mutex_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Refcounted_Auto_Ptr_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Refcounted_Auto_Ptr_Test - -Refcounted_Auto_Ptr_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Refcounted_Auto_Ptr_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Refcounted_Auto_Ptr_Test.cpp \ - Refcounted_Auto_Ptr_Test.h - -Refcounted_Auto_Ptr_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Reference_Counted_Event_Handler_Test.am - -noinst_PROGRAMS += Reference_Counted_Event_Handler_Test - -Reference_Counted_Event_Handler_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reference_Counted_Event_Handler_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reference_Counted_Event_Handler_Test.cpp - -Reference_Counted_Event_Handler_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Reverse_Lock_Test.am - -noinst_PROGRAMS += Reverse_Lock_Test - -Reverse_Lock_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Reverse_Lock_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Reverse_Lock_Test.cpp - -Reverse_Lock_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SOCK_Connector_Test.am - -noinst_PROGRAMS += SOCK_Connector_Test - -SOCK_Connector_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Connector_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Connector_Test.cpp - -SOCK_Connector_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SOCK_Dgram_Bcast_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_Dgram_Bcast_Test - -SOCK_Dgram_Bcast_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Dgram_Bcast_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Dgram_Bcast_Test.cpp - -SOCK_Dgram_Bcast_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SOCK_Dgram_Test.am - -noinst_PROGRAMS += SOCK_Dgram_Test - -SOCK_Dgram_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Dgram_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Dgram_Test.cpp - -SOCK_Dgram_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SOCK_Netlink_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_Netlink_Test - -SOCK_Netlink_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Netlink_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Netlink_Test.cpp - -SOCK_Netlink_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SOCK_SEQPACK_SCTP_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_SEQPACK_SCTP_Test - -SOCK_SEQPACK_SCTP_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_SEQPACK_SCTP_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_SEQPACK_SCTP_Test.cpp - -SOCK_SEQPACK_SCTP_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SOCK_Send_Recv_Test.am - -noinst_PROGRAMS += SOCK_Send_Recv_Test - -SOCK_Send_Recv_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Send_Recv_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Send_Recv_Test.cpp - -SOCK_Send_Recv_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SOCK_Send_Recv_Test_IPV6.am - -noinst_PROGRAMS += SOCK_Send_Recv_Test_IPV6 - -SOCK_Send_Recv_Test_IPV6_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Send_Recv_Test_IPV6_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Send_Recv_Test_IPV6.cpp - -SOCK_Send_Recv_Test_IPV6_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SOCK_Test.am - -noinst_PROGRAMS += SOCK_Test - -SOCK_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Test.cpp - -SOCK_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SOCK_Test_IPv6.am - -noinst_PROGRAMS += SOCK_Test_IPv6 - -SOCK_Test_IPv6_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Test_IPv6_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Test_IPv6.cpp - -SOCK_Test_IPv6_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SPIPE_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SPIPE_Test - -SPIPE_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SPIPE_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SPIPE_Test.cpp - -SPIPE_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.SString_Test.am - -noinst_PROGRAMS += SString_Test - -SString_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SString_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SString_Test.cpp - -SString_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.SV_Shared_Memory_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SV_Shared_Memory_Test - -SV_Shared_Memory_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SV_Shared_Memory_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SV_Shared_Memory_Test.cpp - -SV_Shared_Memory_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Semaphore_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Semaphore_Test - -Semaphore_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Semaphore_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Semaphore_Test.cpp - -Semaphore_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Sendfile_Test.am - -noinst_PROGRAMS += Sendfile_Test - -Sendfile_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Sendfile_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Sendfile_Test.cpp - -Sendfile_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Service_Config_DLL.am - -noinst_LTLIBRARIES += libService_Config_DLL.la - -libService_Config_DLL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DSERVICE_CONFIG_DLL_BUILD_DLL - -libService_Config_DLL_la_SOURCES = \ - Service_Config_DLL.cpp - -noinst_HEADERS += \ - Service_Config_DLL.h \ - Service_Config_DLL_Export.h - -## Makefile.Service_Config_Test.am - -noinst_PROGRAMS += Service_Config_Test - -Service_Config_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Service_Config_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Service_Config_Test.cpp - -Service_Config_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Signal_Test.am - -noinst_PROGRAMS += Signal_Test - -Signal_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Signal_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Signal_Test.cpp - -Signal_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Sigset_Ops_Test.am - -noinst_PROGRAMS += Sigset_Ops_Test - -Sigset_Ops_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Sigset_Ops_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Sigset_Ops_Test.cpp - -Sigset_Ops_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Simple_Message_Block_Test.am - -noinst_PROGRAMS += Simple_Message_Block_Test - -Simple_Message_Block_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Simple_Message_Block_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Simple_Message_Block_Test.cpp - -Simple_Message_Block_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Svc_Handler_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Svc_Handler_Test - -Svc_Handler_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Svc_Handler_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Svc_Handler_Test.cpp - -Svc_Handler_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.TP_Reactor_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += TP_Reactor_Test - -TP_Reactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -TP_Reactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - TP_Reactor_Test.cpp \ - TP_Reactor_Test.h - -TP_Reactor_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.TSS_Static_Test.am - -noinst_PROGRAMS += TSS_Static_Test - -TSS_Static_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -TSS_Static_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - TSS_Static_Test.cpp - -TSS_Static_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.TSS_Test.am - -noinst_PROGRAMS += TSS_Test - -TSS_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -TSS_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - TSS_Test.cpp - -TSS_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Task_Ex_Test.am - -noinst_PROGRAMS += Task_Ex_Test - -Task_Ex_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Task_Ex_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Task_Ex_Test.cpp \ - Task_Ex_Test.h - -Task_Ex_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Task_Test.am - -noinst_PROGRAMS += Task_Test - -Task_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Task_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Task_Test.cpp - -Task_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Thread_Attrs_Test.am - -noinst_PROGRAMS += Thread_Attrs_Test - -Thread_Attrs_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Thread_Attrs_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Thread_Attrs_Test.cpp - -Thread_Attrs_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Thread_Manager_Test.am - -noinst_PROGRAMS += Thread_Manager_Test - -Thread_Manager_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Thread_Manager_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Thread_Manager_Test.cpp - -Thread_Manager_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Thread_Mutex_Test.am - -noinst_PROGRAMS += Thread_Mutex_Test - -Thread_Mutex_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Thread_Mutex_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Thread_Mutex_Test.cpp - -Thread_Mutex_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Thread_Pool_Reactor_Resume_Test.am - -if BUILD_ACE_OTHER - -noinst_PROGRAMS += Thread_Pool_Reactor_Resume_Test - -Thread_Pool_Reactor_Resume_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Thread_Pool_Reactor_Resume_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Thread_Pool_Reactor_Resume_Test.cpp \ - Thread_Pool_Reactor_Resume_Test.h - -Thread_Pool_Reactor_Resume_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_ACE_OTHER - -## Makefile.Thread_Pool_Reactor_Test.am - -if BUILD_ACE_OTHER - -noinst_PROGRAMS += Thread_Pool_Reactor_Test - -Thread_Pool_Reactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Thread_Pool_Reactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Thread_Pool_Reactor_Test.cpp \ - Thread_Pool_Reactor_Test.h - -Thread_Pool_Reactor_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_ACE_OTHER - -## Makefile.Thread_Pool_Test.am - -noinst_PROGRAMS += Thread_Pool_Test - -Thread_Pool_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Thread_Pool_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Thread_Pool_Test.cpp - -Thread_Pool_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Time_Service_Test.am - -noinst_PROGRAMS += Time_Service_Test - -Time_Service_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Time_Service_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Time_Service_Test.cpp - -Time_Service_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Time_Value_Test.am - -noinst_PROGRAMS += Time_Value_Test - -Time_Value_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Time_Value_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Time_Value_Test.cpp - -Time_Value_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timeprobe_Test.am - -noinst_PROGRAMS += Timeprobe_Test - -Timeprobe_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timeprobe_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Timeprobe_Test.cpp - -Timeprobe_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timer_Cancellation_Test.am - -noinst_PROGRAMS += Timer_Cancellation_Test - -Timer_Cancellation_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timer_Cancellation_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Timer_Cancellation_Test.cpp - -Timer_Cancellation_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timer_Queue_Reference_Counting_Test.am - -noinst_PROGRAMS += Timer_Queue_Reference_Counting_Test - -Timer_Queue_Reference_Counting_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timer_Queue_Reference_Counting_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Timer_Queue_Reference_Counting_Test.cpp - -Timer_Queue_Reference_Counting_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Timer_Queue_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Timer_Queue_Test - -Timer_Queue_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Timer_Queue_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Timer_Queue_Test.cpp - -Timer_Queue_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.TkReactor_Test.am - -if BUILD_ACE_TKREACTOR -if BUILD_TK - -noinst_PROGRAMS += TkReactor_Test - -TkReactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_TK_CPPFLAGS) \ - $(ACE_TCL_CPPFLAGS) - -TkReactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - TkReactor_Test.cpp - -TkReactor_Test_LDFLAGS = \ - $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) - -TkReactor_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_TK_LIBS) \ - $(ACE_TCL_LIBS) - -endif BUILD_TK -endif BUILD_ACE_TKREACTOR - -## Makefile.Token_Strategy_Test.am - -noinst_PROGRAMS += Token_Strategy_Test - -Token_Strategy_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Token_Strategy_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Token_Strategy_Test.cpp - -Token_Strategy_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Tokens_Test.am - -if BUILD_ACE_TOKEN - -noinst_PROGRAMS += Tokens_Test - -Tokens_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Tokens_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Tokens_Test.cpp - -Tokens_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_ACE_TOKEN - -## Makefile.UPIPE_SAP_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += UPIPE_SAP_Test - -UPIPE_SAP_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -UPIPE_SAP_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - UPIPE_SAP_Test.cpp - -UPIPE_SAP_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.UUID_Test.am - -if BUILD_ACE_UUID -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += UUID_Test - -UUID_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -UUID_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - UUID_Test.cpp - -UUID_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_ACE_UUID - -## Makefile.Unbounded_Set_Test.am - -noinst_PROGRAMS += Unbounded_Set_Test - -Unbounded_Set_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Unbounded_Set_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Unbounded_Set_Test.cpp - -Unbounded_Set_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Upgradable_RW_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Upgradable_RW_Test - -Upgradable_RW_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Upgradable_RW_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Upgradable_RW_Test.cpp \ - Upgradable_RW_Test.h - -Upgradable_RW_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - -## Makefile.Vector_Test.am - -noinst_PROGRAMS += Vector_Test - -Vector_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Vector_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Vector_Test.cpp - -Vector_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.WFMO_Reactor_Test.am - -noinst_PROGRAMS += WFMO_Reactor_Test - -WFMO_Reactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -WFMO_Reactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - WFMO_Reactor_Test.cpp - -WFMO_Reactor_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.XtAthenaReactor_Test.am - -if BUILD_ACE_XTREACTOR -if BUILD_ATHENA -if BUILD_X11 -if BUILD_XT - -noinst_PROGRAMS += XtAthenaReactor_Test - -XtAthenaReactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -XtAthenaReactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - XtAthenaReactor_Test.cpp - -XtAthenaReactor_Test_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -XtAthenaReactor_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXaw \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_ATHENA -endif BUILD_ACE_XTREACTOR - -## Makefile.XtMotifReactor_Test.am - -if BUILD_ACE_XTREACTOR -if BUILD_MOTIF -if BUILD_X11 -if BUILD_XT - -noinst_PROGRAMS += XtMotifReactor_Test - -XtMotifReactor_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -XtMotifReactor_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - XtMotifReactor_Test.cpp - -XtMotifReactor_Test_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -XtMotifReactor_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXm \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_MOTIF -endif BUILD_ACE_XTREACTOR - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/tests/Memcpy_Test.cpp b/ACE/tests/Memcpy_Test.cpp index d2dd7501777..561bbf8cd0e 100644 --- a/ACE/tests/Memcpy_Test.cpp +++ b/ACE/tests/Memcpy_Test.cpp @@ -8,9 +8,6 @@ * * This test compares the performance of ACE_OS::memcpy with * that of smemcpy which unrolls the memcpy loop upto size = 16. - * This test is also run via autoconf and if smemcpy is faster, - * ACE_HAS_MEMCPY_LOOP_UNROLL flag is set. - * */ //============================================================================= diff --git a/ACE/tests/README b/ACE/tests/README index e25b50e296c..e3c3d64c43f 100644 --- a/ACE/tests/README +++ b/ACE/tests/README @@ -13,7 +13,7 @@ features. Building and running the tests is straightforward: 2. You then need to run all the tests, e.g., by running the perl script ACE_ROOT/tests/run_test.pl - + Naturally, make sure that you've installed perl first! 3. If everything works then you should see something like this: diff --git a/ACE/tests/SSL/Makefile.am b/ACE/tests/SSL/Makefile.am deleted file mode 100644 index ee10293e8ca..00000000000 --- a/ACE/tests/SSL/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.SSL_Asynch_Stream_Test.am - -if BUILD_SSL -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SSL_Asynch_Stream_Test - -SSL_Asynch_Stream_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -SSL_Asynch_Stream_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SSL_Asynch_Stream_Test.cpp - -SSL_Asynch_Stream_Test_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -SSL_Asynch_Stream_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(top_builddir)/tests/libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif !BUILD_ACE_FOR_TAO -endif BUILD_SSL - -## Makefile.Thread_Pool_Reactor_SSL_Test.am - -if BUILD_SSL - -noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test - -Thread_Pool_Reactor_SSL_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_HAS_SSL=1 \ - @ACE_TLS_CPPFLAGS@ - -Thread_Pool_Reactor_SSL_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Thread_Pool_Reactor_SSL_Test.cpp \ - Thread_Pool_Reactor_SSL_Test.h - -Thread_Pool_Reactor_SSL_Test_LDFLAGS = \ - @ACE_TLS_LDFLAGS@ - -Thread_Pool_Reactor_SSL_Test_LDADD = \ - $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \ - $(top_builddir)/tests/libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - @ACE_TLS_LIBS@ - -endif BUILD_SSL - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/tests/Service_Config_Test.conf.xml b/ACE/tests/Service_Config_Test.conf.xml index 3b18637e308..a83de7d8053 100644 --- a/ACE/tests/Service_Config_Test.conf.xml +++ b/ACE/tests/Service_Config_Test.conf.xml @@ -1,7 +1,9 @@ -<!-- $Id$ --> <?xml version='1.0'?> <!-- Converted from Service_Config_Test.conf by svcconf-convert.pl --> <ACE_Svc_Conf> + <!-- --> + <!-- $Id$ --> + <!-- --> <!-- Dynamically loading each of the Service Objects below causes a --> <!-- number of threads to be spawned, each one invoking the Service --> <!-- Configurator (e.g. ACE_Service_Config::process_directive(). If the --> diff --git a/ACE/websvcs/Makefile.am b/ACE/websvcs/Makefile.am deleted file mode 100644 index 038bf2ff84f..00000000000 --- a/ACE/websvcs/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -SUBDIRS = \ - lib \ - tests - diff --git a/ACE/websvcs/README b/ACE/websvcs/README index 4eec972c901..8f2a1c3f09c 100644 --- a/ACE/websvcs/README +++ b/ACE/websvcs/README @@ -1,7 +1,7 @@ -# $Id$ +$Id$ - This directory contains utility classes to build web clients -and servers. At this point we have only implemented simple classes to +This directory contains utility classes to build web clients +and servers. At this point we have only implemented simple classes to manipulate and parse URL addresses, but hopefully the library will grow over time. diff --git a/ACE/websvcs/lib/Makefile.am b/ACE/websvcs/lib/Makefile.am deleted file mode 100644 index 689c2933594..00000000000 --- a/ACE/websvcs/lib/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.websvcs.am - -noinst_LTLIBRARIES = libwebsvcs.la - -libwebsvcs_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -DACE_WEBSVCS_BUILD_DLL - -libwebsvcs_la_SOURCES = \ - URL_Addr.cpp - -noinst_HEADERS = \ - URL_Addr.h \ - URL_Addr.inl - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/websvcs/tests/Makefile.am b/ACE/websvcs/tests/Makefile.am deleted file mode 100644 index 7e366240ae7..00000000000 --- a/ACE/websvcs/tests/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - -## Makefile.Websvcs_Test.am - -noinst_PROGRAMS = Test_Url_Addr - -Test_Url_Addr_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Test_Url_Addr_SOURCES = \ - Test_URL_Addr.cpp - -Test_Url_Addr_LDADD = \ - $(top_builddir)/websvcs/lib/libwebsvcs.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index ff61d11da86..10543471a9b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,982 @@ +Thu Nov 03 13:25:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * tests/Collocation/Sender/Sender_exec.cpp: + * bin/ciao_tests.lst + Only if defined CCM_DIRECTCOLL run test. + +Thu Nov 03 08:52:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + Fixed WCHAR compile problem. + +Wed Nov 02 12:09:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/Receiver/Receiver_exec.cpp: + Cancel timer and delete generators + +Wed Nov 02 08:04:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/Receiver/Receiver_exec.cpp: + * tests/Collocation/Sender/Sender_exec.cpp: + Removed unreferenced local variables + + +Wed Nov 02 08:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Tue Nov 1 09:11:13 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/Inherited_Component/Extended/Base.mpc: + Layout changes. + + * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc: + Linux link error. + + Tue Nov 1 08:48:41 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/Inherited_Component/Extended/Derived.idl: + Used module name to identify the supported interface. + + * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc: + Fixed link issue on linux + + Mon Oct 31 13:53:36 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Extension/Extension_Container.h: + * ciao/Containers/Session/Session_Container.h: + * ciao/Contexts/Extension/Extension_Context_T.cpp: + * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp: + * ciao/Deployment/Handlers/CIAO_State.cpp: + * ciao/Deployment/Handlers/Component_Handler.h: + * ciao/Deployment/Handlers/Component_Handler.cpp: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + * ciao/Deployment/Handlers/Container_Handler.cpp: + * ciao/Deployment/Handlers/Home_Handler.h: + * ciao/Deployment/Handlers/Home_Handler.cpp: + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + * ciao/Servants/Connector_Servant_Impl_Base.cpp: + Several improvements regarding thread safety. Also + some minor code layout changes. + + * ciao/Containers/Extension/README: + * ciao/Contexts/Extension/README: + * ciao/Servants/Extension/README: + Added: Extension containers are not ready to use, yet. + + Sat Oct 29 14:25:16 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: + * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc: + Fuzz. + + * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc: + * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc: + * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc: + Fixed double project names. + + Fri Oct 28 15:55:29 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: + Fixed compile and link issues on windows + + Fri Oct 28 15:04:03 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: + Fixed another link issue. + + Fri Oct 28 15:00:43 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: + Fixed link issue on windows. + + Fri Oct 28 14:55:18 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: + Fixed compile issues on windows. + + Fri Oct 28 14:52:38 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc: + Added libpaths. + + Fri Oct 28 14:49:01 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: + Fixed afters. + + Fri Oct 28 14:18:46 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/IDL_Test: + * connectors/dds4ccm/tests/IDL_Test/Base: + * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl: + * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc: + * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl: + * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc: + * connectors/dds4ccm/tests/IDL_Test/Component: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl: + * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc: + * connectors/dds4ccm/tests/IDL_Test/Connector: + * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl: + * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc: + Compilation test. + + * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc: + Fixed link issue + + Fri Oct 28 14:17:05 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/Inherited_Component/Extended: + + * tests/IDL_Test/Inherited_Component/Extended/Base.idl: + * tests/IDL_Test/Inherited_Component/Extended/Base.mpc: + * tests/IDL_Test/Inherited_Component/Extended/Derived.idl: + * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc: + * tests/IDL_Test/Inherited_Component/Extended/Tester.cpp: + Compilation test. + + Thu Oct 27 10:10:00 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * ciao/Deployment/Interceptors/Deployment_Interceptors.h: + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + + Changed basic CIAO_ReferenceLookup_i to attempt handling resolving + externalReference endpoints as CORBA IOR type references. + Added factory method for creating interceptor. + + * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: + + Change to allow overruling CIAO_LOG_LEVEL from commandline. + + === end changelog === + +Tue Nov 1 19:23:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/ccm_svnt.mpb: + * MPC/config/ciao_container_base_stub.mpb: + Removed avoids_corba_e_compact, should work now + +Tue Nov 1 13:16:16 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + * tests/DAnCE/ExecutionManager-Deployments/run_test.pl: + + Integrated improvements from Martin Corino <mcorino@remedy.nl>. + +Thu Nov 01 10:54:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy SA work branch. + + === start changelog === + + Tue Nov 01 08:41:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/Sender/Sender_exec.cpp: + Add define in test in case of CIAO not build with + ccm_direct_colloation. + + Mon Oct 31 13:55:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * ciao/Containers/Container_Base.idl: + * ciao/Containers/Container_Base_T.h: + * ciao/Containers/Container_Base_T.cpp: + * ciao/Servants/Extension/Extension_Container.h: + * ciao/Servants/Connector_Servant_Impl_Base.cpp: + * ciao/Servants/Servant_Impl_Base.cpp: + * ciao/Servants/Servants.mpc: + Removed already disabled lines with servant- and portactivators + + * ciao/Containers/CIAO_Servant_Activator.idl: + * ciao/Containers/CIAO_Servant_Activator.mpc: + * ciao/Containers/Servant_Activator.h: + * ciao/Containers/Servant_Activator.cpp: + * ciao/Servants/Port_Activator_T.cpp: + * ciao/Servants/Port_Activator_T.h: + * ciao/Servants/CIAO_Port_Activator.idl: + * ciao/Servants/Port_Activator.h: + * ciao/Servants/Port_Activator.cpp: + * MPC/config/ciao_port_activator_stub.mpb: + * MPC/config/ciao_servant_activator_stub.mpb: + * MPC/config/ciao_servant_activator.mpb: + + Deleted this files. + + + + Mon Oct 31 13:30:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/README: + Explanation of the test + + Mon Oct 31 13:19:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/Coll_Base/Base.idl: + * tests/Collocation/Coll_Base/Base.mpc: + * tests/Collocation/Receiver/Receiver.idl: + * tests/Collocation/Receiver/Receiver_exec.h: + * tests/Collocation/Receiver/Receiver_exec.cpp: + * tests/Collocation/Sender/Sender.idl: + * tests/Collocation/Sender/Sender_exec.h: + * tests/Collocation/Sender/Sender_exec.cpp: + * tests/Collocation/descriptors/PlanAllOnOne.cdp: + * tests/Collocation/descriptors/run_test.pl: + Expanded test. Use different CollocationStrategies via + attributes in deploymentplans. + + Tue Oct 27 07:16:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * ciao/Containers/Extension/Extension_Containers.mpc: + Remove ciao_port_activator_stub and cia_servant_activator_stub + * ciao/Servants/Servant_Impl_Base.cpp: + Committed the right file now. + + Wed Oct 26 12:018:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * ciao/Containers/Session/Session_Containers.mpc: + Remove ciao_port_activator_stub and cia_servant_activator_stub + + Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * ciao/Containers/Containers.mpc: + Remove ciao_port_activator_stub and cia_servant_activator_stub + + + Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * MPC/config/ciao_extension_container.mpb: + * MPC/config/ciao_extension_container_stub.mpb: + * MPC/config/ciao_servant.mpb: + * MPC/config/ciao_session_container.mpb: + * MPC/config/ciao_session_container_stub.mpb: + * ciao/Containers/Containers.mpc: + * ciao/Containers/Extension/Extension_Container.mpc: + * ciao/Containers/Session/Session_Container.mpc: + Remove ciao_port_activator_stub and cia_servant_activator_stub + + * ciao/Containers/CIAO_Servant_Activator.idl: + * ciao/Containers/CIAO_Servant_Activator.mpc: + * ciao/Containers/Servant_Activator.h: + * ciao/Containers/Servant_Activator.cpp: + * ciao/Servants/Port_Activator_T.cpp: + * ciao/Servants/CIAO_Port_Activator.idl: + Deactivate content. Later on if build successfull delete files + + * ciao/Containers/Container_Base.idl: + * ciao/Containers/Container_Base_T.h: + * ciao/Containers/Container_Base_T.cpp: + * ciao/Servants/Connector_Servant_Impl_Base.cpp: + * ciao/Servants/Servant_Impl_Base.cpp: + * ciao/Servants/Servants.mpc: + Disable Servant_Activator and Port_Activator functionality, + Later on if build successfull delete lines + + * tests/Collocation/Coll_Base/Base.mpc: + * tests/Collocation/Receiver/Receiver.mpc: + * tests/Collocation/Sender/Sender.mpc: + Remove avoids_no_events and -GD (already global defined) + + * tests/Collocation/descriptors/run_test.pl: + Disable debug logs + + * bin/ciao_tests.lst: + Add CIAO/tests/Collocation + + === end changelog === + +Sun Oct 30 22:39:45 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * ciao/Deployment/Interceptors/Deployment_Interceptors.h: + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + + Moved external reference resolution to the interceptor. + +Fri Oct 21 07:24:24 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: + Fixed typo + +Fri Oct 21 07:06:59 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/README: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: + Fixed opendds compile errors. + +Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Thu Oct 20 08:56:25 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Optimized logging + + * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp: + Reverted extra test. More investigation needed. + + Wed Oct 19 14:19:49 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Fixed some typos in comments. + + * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp: + Added extra tests on exit. + + Tue Oct 18 14:06:44 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Servants/Connector_Servant_Impl_Base.cpp: + * ciao/Servants/Home_Servant_Impl_T.cpp: + * ciao/Servants/Servant_Impl_Base.cpp: + * ciao/Servants/Session/Servant_Impl_T.cpp: + Using class variables in a thread safe way. + Code alignment. + + Tue Oct 18 10:02:14 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * NEWS: + Info about thread safety. + + * ciao/Containers/Servant_Activator.cpp: + Minor code updates. + + * ciao/Contexts/Context_Impl_Base_T.cpp: + * ciao/Contexts/Session/Session_Context_T.cpp: + Made the container_ variable thread safe. + + Tue Oct 18 08:57:34 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * MPC/ccm_direct_collocation.mpb: + * MPC/avoids_ccm_direct_collocation.mpb: + * MPC/ciaoidldefaults.mpb: + * MPC/ccm_svnt.mpb: + * MPC/ccm.mpb: + * MPC/ciao_base.mpb: + * MPC/ciao.mpb: + * MPC/ciao_servant.mpb: + * MPC/ciao_servant_activator_stub.mpb: + Add direct_collocation to projects + + + + + Tue Oct 18 08:31:34 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Container_Base_T.cpp: + Using temporary _var variables in order to be thread safe. + + Mon Oct 17 14:01:44 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/CIAO_State.h: + * ciao/Deployment/Handlers/CIAO_State.cpp: + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Using mutexes to be threadsafe. + + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + Using this for class variable. + + * ciao/Servants/Extension/Servant_Impl_T.cpp: + Renamed some variables. + + Mon Oct 17 08:31:17 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + A subscriber must be created when just listeners are created. + + Fri Oct 14 12:18:05 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/ResetTopic/TooLong: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Base: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h: + * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors: + * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl: + Added a test which test whether the correct exception is thrown when a topic cannot + be created by DDS. + + Thu Oct 13 06:30:15 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/logger/Log_Macros.h: + Fixed compile errors when all logging is disabled. Seems that no space + is allowed between the declaration and the first bracket ( "XXX (Y)" should + be "XXX(Y)" ). + + Wed Oct 12 13:10:27 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Base/CIAO_Base.mpc: + * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc: + * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: + * connectors/dds4ccm/idl/dds4ccm_skel.mpc: + * connectors/dds4ccm/idl/dds4ccm_stub.mpc: + * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc: + * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc: + * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc: + * connectors/dds4ccm/impl/dds4ccm_impl.mpc: + * connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc: + * connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc: + Fixed several install issues. + + Wed Oct 12 12:37:47 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/CollocatedPubSub: + * connectors/dds4ccm/tests/CollocatedPubSub/Base: + * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl: + * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc: + * connectors/dds4ccm/tests/CollocatedPubSub/Connector: + * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl: + * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc: + * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent: + * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl: + * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc: + * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h: + * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp: + * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent: + * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl: + * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc: + * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h: + * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp: + * connectors/dds4ccm/tests/CollocatedPubSub/descriptors: + * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl: + New test. Three components running on the same node. One writes the samples + to DDS and collects these sample at the same time. The other two components just + listen. All listeners have a QueryFilter applied. + + Wed Oct 12 12:25:34 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * tests/Collocation: + * tests/Collocation/Sender: + * tests/Collocation/Sender/Sender.idl: + * tests/Collocation/Sender/Sender_exec.cpp: + * tests/Collocation/Sender/Sender.mpc: + * tests/Collocation/Sender/Sender_exec.h: + * tests/Collocation/.project: + * tests/Collocation/Coll_Base: + * tests/Collocation/Coll_Base/Base.mpc: + * tests/Collocation/Coll_Base/Base.idl: + * tests/Collocation/descriptors: + * tests/Collocation/descriptors/run_test.pl: + * tests/Collocation/descriptors/PlanAllOnOne.cdp: + * tests/Collocation/Receiver: + * tests/Collocation/Receiver/Receiver.mpc: + * tests/Collocation/Receiver/Receiver_exec.h: + * tests/Collocation/Receiver/Receiver_exec.cpp: + * tests/Collocation/Receiver/Receiver.idl: + Test for collocation, for playing with results change OrbStrategy in cdp plan + + Wed Oct 12 09:07:34 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: + We also need to create a subscriber and publisher when the user + is using a ConnectorStatusListener; the Subscriber Listener and + Publisher Listener are involved in the ConnectorStatusListener. + + Wed Oct 12 08:58:10 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp: + Extended this test a bit more. + + Tue Oct 11 14:27:23 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: + Layout changes. + + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: + Fixed warnings. + + Tue Oct 11 09:34:02 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * NEWS: + Updated. + + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Improved logging: mentioning the connection which has + been pre-established. + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: + Prevent the creation of a subscriber or publisher when + they are not needed. + + * connectors/dds4ccm/tests/ResetTopic/README: + Updated. + + Mon Oct 10 14:11:45 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Added validate_connection when a user want's the connections to + be connected during deployment (instead of on first usage). This can + be switched on by setting the CIAO_PRE_ESTABLISH_CONNECTIONS define + + Mon Oct 10 08:03:56 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp: + No need to check of the NonChangeable exception, since the topic name can be reset. + + Mon Oct 10 07:55:48 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h: + * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp: + No need to check of the NonChangeable exception. Since the topic name can be reset. + + Mon Oct 10 07:46:35 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: + Fixed ref count issue. Because of this, the core crashed on exit. + + Fri Oct 7 15:41:09 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: + Minor change of names. + + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: + Some extra check on whether samples were received during each run. + + Fri Oct 7 15:30:37 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp: + Some extra check on whether samples were received during each run. + + Thu Oct 6 11:34:13 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: + + * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: + Optimized logging. + + * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: + * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: + Removed unnecessary logging. + + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc: + Fixed warnings on FC15. + + Wed Oct 5 15:12:49 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp: + Enabled test for state connector. + + Wed Oct 5 14:16:49 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + Start DDS when the topic name is not empty. + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp: + Clearing topic name on a running DDS connector. After clearing, start writing. + The connector should throw a bad_inv_order exception. Setting the topic name again. + The sender should be able to write again. Need to expanded with an updater + (state connector). + + Wed Oct 5 12:39:54 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + Components are always set when a port is obtained. This does not + depend on whether the topic name has been set. + + Wed Oct 5 12:29:41 UTC 2011 Marcel Smit <msmit@remedy.nl> + + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.h: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + Reset the components in the ccm_remove method itself since this is + the only place where these components need to be reset. + + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: + Applied coding conventions. + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl: + A new test which tests the reset of topic names in the state connector. + + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: + Removed unnecessary logging + + Wed Oct 5 07:58:13 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/ResetTopic/WriteListen: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl: + Reset of topic name during write and listen operations. + + Mon Oct 3 14:18:35 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Get_T.h: + * connectors/dds4ccm/impl/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/DDS_Listen_T.h: + * connectors/dds4ccm/impl/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/DDS_StateListen_T.h: + * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: + * connectors/dds4ccm/impl/DDS_Update_T.h: + * connectors/dds4ccm/impl/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/DDS_Write_T.h: + * connectors/dds4ccm/impl/DDS_Write_T.cpp: + Setting the component to nil in the State connector and Event connector, + instead of setting it in the extended ports. + + Fri Sep 30 16:27:55 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc: + Fixed duplicate project names. + + Fri Sep 30 08:28:31 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + Added new test to the test framework + + Fri Sep 30 08:08:14 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: + * connectors/dds4ccm/idl/dds4ccm_skel.mpc: + Layout changes + + * connectors/dds4ccm/impl/CCM_DataReader.cpp: + * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Get_T.h: + * connectors/dds4ccm/impl/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/DDS_Listen_T.h: + * connectors/dds4ccm/impl/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/DDS_StateListen_T.h: + * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.h: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Update_T.h: + * connectors/dds4ccm/impl/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/DDS_Write_T.h: + * connectors/dds4ccm/impl/DDS_Write_T.cpp: + * connectors/dds4ccm/impl/Getter_T.cpp: + * connectors/dds4ccm/impl/Reader_T.cpp: + Ability to change the topic name. When a topic name changes, + DDS will be restarted. After restart, the connector manages the + new topic. + + * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp: + Improved logging + + * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp: + * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h: + * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp: + * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp: + Removed test for NonChangeable exception. + + + * connectors/dds4ccm/tests/ResetTopic: + * connectors/dds4ccm/tests/ResetTopic/README: + * connectors/dds4ccm/tests/ResetTopic/ReadGet: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl: + Added test which test the reset DDS within the connector. See readme for more information. + + === end changelog === + +Thu Oct 13 19:09:42 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * ciao/Deployment/Handlers/Container_Handler.cpp: + + File missing from previous commit. + +Thu Oct 13 19:04:17 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * ciao/Base/CIAO_Properties.idl: + * ciao/Deployment/Handlers/Component_Handler.cpp: + * ciao/Deployment/Handlers/Home_Handler.cpp: + * ciao/Deployment/Handlers/Homed_Component_Handler.cpp: + + Changed to use constants in the CIAO_Properties file to identify + implementation type. + +Mon Oct 10 08:48:51 CEST 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * CIAO version 1.0.5 released. + +Sat Oct 8 08:45:40 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: + Fixed runtime issue. XML doesn't allow comments before the <xml ... > tag. + +Fri Oct 7 09:46:31 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * docs/CIAO_Style_Guide.txt: + * docs/Porting_Hints.txt: + * performance-tests/Benchmark/descriptors/NOTE.txt: + Fuzz. + +Fri Oct 7 09:20:40 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/ami4ccm/tests/ThreeComp/README.txt: + * connectors/dds4ccm/performance-tests/Latency/descriptors/README: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README: + * connectors/dds4ccm/tests/DDSEntity/README: + * connectors/dds4ccm/tests/Event_Connection_Test/README: + * connectors/dds4ccm/tests/Getter/README: + * connectors/dds4ccm/tests/InstanceHandle/README: + * connectors/dds4ccm/tests/KeyedSamples/README: + * connectors/dds4ccm/tests/LateBinding/README: + * connectors/dds4ccm/tests/ListenManyByMany/README: + * connectors/dds4ccm/tests/ListenNotEnabled/README: + * connectors/dds4ccm/tests/ListenOneByOne/README: + * connectors/dds4ccm/tests/NonChangeableAttribute/README: + * connectors/dds4ccm/tests/QueryCondition/DDS/README: + * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README: + * connectors/dds4ccm/tests/QueryCondition/Different/README: + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/README: + * connectors/dds4ccm/tests/Reader/README: + * connectors/dds4ccm/tests/SetConnectorAttributes/README: + * connectors/dds4ccm/tests/SharedDomainParticipant/README: + * connectors/dds4ccm/tests/State_Connection_Test/README: + * connectors/dds4ccm/tests/UnkeyedSamples/README: + * connectors/tests/AMIDDS/README.txt: + * examples/BasicSP/EC/README: + * examples/DevGuideExamples/readme.txt: + * tests/CIDL/CodeGen/README: + * tests/DAnCE/EM-Launch-Failures/README.txt: + * tests/DAnCE/EM-Redeployment/README.txt: + * tests/DAnCE/EM-Shutdown-Failures/README.txt: + * tests/DAnCE/Threading/README: + * tests/IDL3/Connectors/README.txt: + * tests/IDL3/Events/Any/README: + * tests/IDL3/Lookup/README: + * tests/IDL3_to_XMI/Forward_Declared/README: + * tests/IDL_Test/IDL3_Plus/README: + * tests/IDL_Test/Reused_Facet_Interface/README: + * tests/Thread/README.txt: + Fuzz: Id-tags. + +Fri Oct 7 07:59:11 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: + Fuzz: Trailing whitespace + +Fri Oct 7 07:08:30 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: + Changed Id tag so that it's recognized by svn. + +Fri Oct 7 07:07:19 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: + Reverted last changes. + +Thu Oct 6 12:07:52 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: + * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: + * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: + * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: + Fuzz. Added Id string. + + * tests/CIF/Common/CIF_Common.cpp: + Check on orb is not nil. + Tue Aug 23 18:18:23 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/CIAO/MPC/config/avoids_ccm_direct_collocation.mpb b/CIAO/MPC/config/avoids_ccm_direct_collocation.mpb new file mode 100644 index 00000000000..96597091e05 --- /dev/null +++ b/CIAO/MPC/config/avoids_ccm_direct_collocation.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +feature(ccm_direct_collocation) { + avoids += ccm_direct_collocation +} diff --git a/CIAO/MPC/config/ccm.mpb b/CIAO/MPC/config/ccm.mpb index a6c49e6b649..0c0a62e8a67 100644 --- a/CIAO/MPC/config/ccm.mpb +++ b/CIAO/MPC/config/ccm.mpb @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project { +project : ccm_direct_collocation{ includes += $(CIAO_ROOT)/ccm } diff --git a/CIAO/MPC/config/ccm_direct_collocation.mpb b/CIAO/MPC/config/ccm_direct_collocation.mpb new file mode 100644 index 00000000000..20d299a11d1 --- /dev/null +++ b/CIAO/MPC/config/ccm_direct_collocation.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +feature (ccm_direct_collocation) : taobaseidldefaults { + macros += CCM_DIRECTCOLL + idlflags += -DCCM_DIRECTCOLL -Gd +} diff --git a/CIAO/MPC/config/ccm_svnt.mpb b/CIAO/MPC/config/ccm_svnt.mpb index fedd8d8f748..49c094f62fc 100644 --- a/CIAO/MPC/config/ccm_svnt.mpb +++ b/CIAO/MPC/config/ccm_svnt.mpb @@ -2,7 +2,7 @@ // $Id$ project : ccm_session_stub, portableserver, avoids_minimum_corba, \ - avoids_corba_e_compact, avoids_corba_e_micro { + avoids_corba_e_micro, ccm_direct_collocation { after += CCM_svnt libs += CCM_svnt } diff --git a/CIAO/MPC/config/ciao.mpb b/CIAO/MPC/config/ciao.mpb index e4cd35ca8a7..1a48adcfc9c 100644 --- a/CIAO/MPC/config/ciao.mpb +++ b/CIAO/MPC/config/ciao.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project { +project: ccm_direct_collocation { includes += $(CIAO_ROOT) libpaths += $(ACE_ROOT)/lib } diff --git a/CIAO/MPC/config/ciao_base.mpb b/CIAO/MPC/config/ciao_base.mpb index c10abbf8a58..2ebb0aa4d27 100644 --- a/CIAO/MPC/config/ciao_base.mpb +++ b/CIAO/MPC/config/ciao_base.mpb @@ -1,6 +1,6 @@ // $Id$ -project : ccm_cookie, ccm_configvalue { +project : ccm_cookie, ccm_configvalue, ccm_direct_collocation { after += CIAO_Base_stub libs += CIAO_Base_stub } diff --git a/CIAO/MPC/config/ciao_container_base_stub.mpb b/CIAO/MPC/config/ciao_container_base_stub.mpb index aa8d80afb8a..cc87952b435 100644 --- a/CIAO/MPC/config/ciao_container_base_stub.mpb +++ b/CIAO/MPC/config/ciao_container_base_stub.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ccm_svnt, avoids_corba_e_compact, avoids_corba_e_micro { +project : ccm_svnt, avoids_corba_e_micro { after += CIAO_Container_Base_stub libs += CIAO_Container_Base_stub } diff --git a/CIAO/MPC/config/ciao_extension_container.mpb b/CIAO/MPC/config/ciao_extension_container.mpb index 9deacd8a8b0..c1e5910b870 100644 --- a/CIAO/MPC/config/ciao_extension_container.mpb +++ b/CIAO/MPC/config/ciao_extension_container.mpb @@ -2,8 +2,7 @@ // $Id$ project : utils, ciao_servant, \ - ciao_port_activator_stub, ciao_servant_activator_stub, \ - ciao_extension_container_stub { + ciao_extension_container_stub, ccm_direct_collocation { libs += CIAO_Extension_Container after += CIAO_Extension_Container } diff --git a/CIAO/MPC/config/ciao_extension_container_stub.mpb b/CIAO/MPC/config/ciao_extension_container_stub.mpb index 28b1fa64649..e25b0cc567d 100644 --- a/CIAO/MPC/config/ciao_extension_container_stub.mpb +++ b/CIAO/MPC/config/ciao_extension_container_stub.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ciao_port_activator_stub, ciao_servant_activator_stub, ciao_container_base_stub { +project : ciao_container_base_stub, ccm_direct_collocation { libs += CIAO_Extension_Container_stub after += CIAO_Extension_Container_stub } diff --git a/CIAO/MPC/config/ciao_port_activator_stub.mpb b/CIAO/MPC/config/ciao_port_activator_stub.mpb deleted file mode 100644 index 1a38e34dc93..00000000000 --- a/CIAO/MPC/config/ciao_port_activator_stub.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : portableserver { - after += CIAO_Port_Activator_stub - libs += CIAO_Port_Activator_stub -} diff --git a/CIAO/MPC/config/ciao_servant.mpb b/CIAO/MPC/config/ciao_servant.mpb index 75641901a43..cbe22739e64 100644 --- a/CIAO/MPC/config/ciao_servant.mpb +++ b/CIAO/MPC/config/ciao_servant.mpb @@ -1,9 +1,9 @@ // -*- MPC -*- //$Id$ -project : ciao_logger, ciao_port_activator_stub, ciao_servant_activator_stub, \ +project : ciao_logger, \ ccm_svnt, taoidldefaults, portableserver, ccm_cookie, ccm_session_stub, \ - ciao_session_container_stub { + ciao_session_container_stub, ccm_direct_collocation { after += CIAO_Servant_Impl libs += CIAO_Servant_Impl } diff --git a/CIAO/MPC/config/ciao_servant_activator.mpb b/CIAO/MPC/config/ciao_servant_activator.mpb deleted file mode 100644 index c4b6973aae1..00000000000 --- a/CIAO/MPC/config/ciao_servant_activator.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : portableserver, ciao_port_activator_stub, ciao_servant_activator_stub, avoids_minimum_corba, ciao_logger { - libs += CIAO_Servant_Activator_impl - after += CIAO_Servant_Activator_impl -} diff --git a/CIAO/MPC/config/ciao_servant_activator_stub.mpb b/CIAO/MPC/config/ciao_servant_activator_stub.mpb deleted file mode 100644 index 260db014f9d..00000000000 --- a/CIAO/MPC/config/ciao_servant_activator_stub.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : portableserver, avoids_minimum_corba { - after += CIAO_Servant_Activator_stub - libs += CIAO_Servant_Activator_stub -} diff --git a/CIAO/MPC/config/ciao_session_container.mpb b/CIAO/MPC/config/ciao_session_container.mpb index 132aaa38639..42a3d796e0d 100644 --- a/CIAO/MPC/config/ciao_session_container.mpb +++ b/CIAO/MPC/config/ciao_session_container.mpb @@ -1,8 +1,8 @@ // -*- MPC -*- // $Id$ -project : utils, ciao_servant, ciao_port_activator_stub, \ - ciao_servant_activator_stub, ciao_session_container_stub { +project : utils, ciao_servant, \ + ciao_session_container_stub, ccm_direct_collocation { libs += CIAO_Session_Container after += CIAO_Session_Container } diff --git a/CIAO/MPC/config/ciao_session_container_stub.mpb b/CIAO/MPC/config/ciao_session_container_stub.mpb index 966a3d8016e..fa55f49da47 100644 --- a/CIAO/MPC/config/ciao_session_container_stub.mpb +++ b/CIAO/MPC/config/ciao_session_container_stub.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ciao_port_activator_stub, ciao_servant_activator_stub, ciao_container_base_stub { +project : ciao_container_base_stub, ccm_direct_collocation { libs += CIAO_Session_Container_stub after += CIAO_Session_Container_stub } diff --git a/CIAO/MPC/config/ciaoidldefaults.mpb b/CIAO/MPC/config/ciaoidldefaults.mpb index 8e7a0cd9791..453c4219d04 100644 --- a/CIAO/MPC/config/ciaoidldefaults.mpb +++ b/CIAO/MPC/config/ciaoidldefaults.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ccm_lw, ccm_noevent, taobaseidldefaults { +project : ccm_lw, ccm_noevent, ccm_direct_collocation, taobaseidldefaults { idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ccm Modify_Custom (IDL) { diff --git a/CIAO/NEWS b/CIAO/NEWS index e61e7b73950..39477c560ec 100644 --- a/CIAO/NEWS +++ b/CIAO/NEWS @@ -1,3 +1,38 @@ +USER VISIBLE CHANGES BETWEEN CIAO-1.0.5 and CIAO-1.1.0 +======================================================= + +. It is now possible to connect connections in a deployment plan + at deployment time instead of connecting them on first use. + This can be established by setting the CIAO_PRE_ESTABLISH_CONNECTIONS + define in your config.h. + +. The DDS4CCM connector now only creates a DDS subscriber or + DDS publisher when they are needed. Previously, the DDS4CCM + always created a DDS publisher and DDS subscriber, regardless + of need. + +. Besides late binding, it is now possible to reset the topic + name in the DDS4CCM connector. This means that the DDS4CCM + connector is able to switch between topics of the same data + type at runtime. Resetting a topic name means that DDS will + be closed down and started again, using the new topic name. + On the outside, all connections to and from the connector + stay intact; therefor the user doesn't need to re-establish + the connections again. Please see + $CIAO_ROOT/connectors/dds4ccm/tests/ResetTopic/README for + more info. This directory also contains some examples on how + to reset a topic name. + Since this is not spec-compliant behavior, an issue has been be + raised on the DDS4CCM specification. + +. Improved thread safety in the CIAO core. + +. Direct collocation between components is now supported. In order to enable + this add ccm_direct_collocation=1 to your default.features. We do recommend + to use the new -ORBCollocationStrategy best which does not require all + user components to be compiled with direct collocation enabled. Enabling + direct collocation does increase the size of the generated code + USER VISIBLE CHANGES BETWEEN CIAO-1.0.4 and CIAO-1.0.5 ======================================================= diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM index c81425ebe56..d58b13740c5 100644 --- a/CIAO/PROBLEM-REPORT-FORM +++ b/CIAO/PROBLEM-REPORT-FORM @@ -41,9 +41,9 @@ To: ciao-users@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - CIAO VERSION: 1.0.4 - TAO VERSION : 2.0.4 - ACE VERSION : 6.0.4 + CIAO VERSION: 1.0.5 + TAO VERSION : 2.0.5 + ACE VERSION : 6.0.5 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/CIAO/VERSION b/CIAO/VERSION index 3501fa9e096..6259d70715c 100644 --- a/CIAO/VERSION +++ b/CIAO/VERSION @@ -1,4 +1,4 @@ -This is CIAO version 1.0.4, released Tue Aug 23 19:01:44 CEST 2011 +This is CIAO version 1.0.5, released Mon Oct 10 08:48:51 CEST 2011 If you have any problems with or questions about CIAO, please send e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu), diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index f8a2dfe0ec6..c9356d865f0 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -18,6 +18,7 @@ TAO/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl: !STATIC !MINIMUM TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT TAO/CIAO/examples/Display/descriptors/run_all_in_one.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT TAO/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT +TAO/CIAO/tests/Collocation/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST CCM_DIRECTCOLL TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT @@ -130,8 +131,14 @@ TAO/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/d TAO/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl: !ACE_FOR_TAO !ST NDDS diff --git a/CIAO/ciao/Base/CIAO_Base.mpc b/CIAO/ciao/Base/CIAO_Base.mpc index 581e172d591..6b4b0bb86f5 100644 --- a/CIAO/ciao/Base/CIAO_Base.mpc +++ b/CIAO/ciao/Base/CIAO_Base.mpc @@ -36,6 +36,7 @@ project(CIAO_Base_stub) : install, ciaolib_with_idl, ciao_output, \ } Header_Files { CIAO_PropertiesC.h + CIAO_ExceptionsC.h Server_init.h Client_init.h CIAO_Base_stub_export.h diff --git a/CIAO/ciao/Base/CIAO_Properties.idl b/CIAO/ciao/Base/CIAO_Properties.idl index 31028553201..22ff63e9e57 100644 --- a/CIAO/ciao/Base/CIAO_Properties.idl +++ b/CIAO/ciao/Base/CIAO_Properties.idl @@ -20,11 +20,11 @@ module CIAO const string COMPONENT_HOME = "edu.vanderbilt.dre.CIAO.ComponentHomeId"; const string CONTAINER_ID = "edu.vanderbilt.dre.CIAO.ContainerId"; - const string CCM_CONTAINER = "edu.dre.vanderbilt.dre.CCM.Container"; - const string CCM_HOME = "edu.dre.vanderbilt.dre.CCM.Home"; - const string CCM_COMPONENT = "edu.dre.vanderbilt.dre.CCM.Component"; - const string CCM_HOMEDCOMPONENT = "edu.dre.vanderbilt.dre.CCM.HomedComponent"; - const string CCM_CONNECTOR = "edu.dre.vanderbilt.dre.CCM.Connector"; + const string CCM_CONTAINER = "edu.vanderbilt.dre.CCM.Container"; + const string CCM_HOME = "edu.vanderbilt.dre.CCM.Home"; + const string CCM_COMPONENT = "edu.vanderbilt.dre.CCM.Component"; + const string CCM_HOMEDCOMPONENT = "edu.vanderbilt.dre.CCM.HomedComponent"; + const string CCM_CONNECTOR = "edu.vanderbilt.dre.CCM.Connector"; }; }; #endif /* CIAO_PROPERTIES_IDL */ diff --git a/CIAO/ciao/Containers/CIAO_Servant_Activator.idl b/CIAO/ciao/Containers/CIAO_Servant_Activator.idl deleted file mode 100644 index 6e725b5821c..00000000000 --- a/CIAO/ciao/Containers/CIAO_Servant_Activator.idl +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file CIAO_Servant_Activator.idl - * @author William R. Otte <wotte@dre.vanderbilt.edu> - * $Id$ - * Local interface extensions for the CIAO servant activator. - */ - -#ifndef CIAO_SERVANT_ACTIVATOR_IDL -#define CIAO_SERVANT_ACTIVATOR_IDL - -#include "tao/PortableServer/ServantActivator.pidl" -#include "ciao/Servants/CIAO_Port_Activator.idl" - -module CIAO -{ - local interface Servant_Activator : PortableServer::ServantActivator - { - boolean update_port_activator (in PortableServer::ObjectId oid); - - boolean register_port_activator (in Port_Activator pa); - }; -}; - -#endif diff --git a/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc b/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc deleted file mode 100644 index 23f0c670b2c..00000000000 --- a/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ - -project(CIAO_Servant_Activator_stub_idl) : install, ciaoidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_include=CIAO_Servant_Activator_stub_export.h \ - -Wb,stub_export_macro=CIAO_SERVANT_ACTIVATOR_STUB_Export \ - -Wb,skel_export_include=CIAO_Servant_Activator_export.h \ - -Wb,skel_export_macro=CIAO_SERVANT_ACTIVATOR_Export \ - -SS -Sci -Gxhst -Gxhsk - IDL_Files { - CIAO_Servant_Activator.idl - } - specific { - install_dir = ciao/Containers - } -} - -project(CIAO_Servant_Activator_stub) : install, ciao_lib, ciao_port_activator_stub, avoids_minimum_corba, ciao_logger { - after += CIAO_Servant_Activator_stub_idl - dynamicflags += CIAO_SERVANT_ACTIVATOR_STUB_BUILD_DLL - - IDL_Files { - } - Source_Files { - CIAO_Servant_ActivatorC.cpp - } - Header_Files { - CIAO_Servant_Activator_stub_export.h - CIAO_Servant_ActivatorC.h - CIAO_Servant_ActivatorS.h - } - specific { - install_dir = ciao/Containers - } -} - -project(CIAO_Servant_Activator_impl) : install, ciao_lib, portableserver, ciao_servant_activator_stub, ciao_port_activator_stub, avoids_minimum_corba, ciao_logger { - after += CIAO_Servant_Activator_stub_idl - dynamicflags += CIAO_SERVANT_ACTIVATOR_BUILD_DLL - - IDL_Files { - } - Source_Files { - Servant_Activator.cpp - } - Header_Files { - CIAO_Servant_Activator_export.h - Servant_Activator.h - } - specific { - install_dir = ciao/Containers - } -} - diff --git a/CIAO/ciao/Containers/Container_Base.idl b/CIAO/ciao/Containers/Container_Base.idl index a97f59cbdd8..7795456c6c4 100644 --- a/CIAO/ciao/Containers/Container_Base.idl +++ b/CIAO/ciao/Containers/Container_Base.idl @@ -11,7 +11,6 @@ #include "ccm/CCM_Base.idl" #include "ccm/CCM_StandardConfigurator.idl" #include "ccm/CCM_CCMException.idl" -#include "ciao/Containers/CIAO_Servant_Activator.idl" #include "ciao/Base/CIAO_Exceptions.idl" #include "ccm/CCM_Exceptions.idl" #include "ccm/CCM_Navigation.idl" @@ -122,8 +121,6 @@ module CIAO in Container_Types::OA_Type type, out PortableServer::ObjectId oid); - Servant_Activator ports_servant_activator (); - Object generate_reference (in string obj_id, in string repo_id, in Container_Types::OA_Type type); diff --git a/CIAO/ciao/Containers/Container_Base_T.cpp b/CIAO/ciao/Containers/Container_Base_T.cpp index 3f1d3e05498..fae1812ae4f 100644 --- a/CIAO/ciao/Containers/Container_Base_T.cpp +++ b/CIAO/ciao/Containers/Container_Base_T.cpp @@ -5,7 +5,6 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "ciao/Containers/Servant_Activator.h" #include "ciao/Servants/Connector_Servant_Impl_Base.h" #include "ciao/Base/CIAO_ExceptionsC.h" @@ -17,8 +16,8 @@ namespace CIAO Container_i<BASE>::Container_i (CORBA::ORB_ptr o, PortableServer::POA_ptr root_poa) : orb_ (::CORBA::ORB::_duplicate (o)), - root_poa_ (::PortableServer::POA::_duplicate (root_poa)), - sa_ (0) + root_poa_ (::PortableServer::POA::_duplicate (root_poa)) + //, sa_ (0) { } @@ -31,18 +30,20 @@ namespace CIAO void Container_i<BASE>::fini (void) { - this->sa_ = ::CIAO::Servant_Activator::_nil (); - if (! CORBA::is_nil (this->component_poa_.in ())) + ::PortableServer::POA_var comp_poa_safe = this->component_poa_._retn (); + + if (! CORBA::is_nil (comp_poa_safe.in ())) { - this->component_poa_->destroy (1, 1); - this->component_poa_ = ::PortableServer::POA::_nil (); + comp_poa_safe->destroy (1, 1); } - if (! CORBA::is_nil (this->facet_cons_poa_.in ())) + ::PortableServer::POA_var facet_cons_poa_safe = + this->facet_cons_poa_._retn (); + + if (! CORBA::is_nil (facet_cons_poa_safe.in ())) { - this->facet_cons_poa_->destroy (1, 1); - this->facet_cons_poa_ = ::PortableServer::POA::_nil (); + facet_cons_poa_safe->destroy (1, 1); } this->root_poa_ = ::PortableServer::POA::_nil (); @@ -92,20 +93,20 @@ namespace CIAO { CIAO_TRACE ("Container_i::install_servant"); - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); + PortableServer::POA_var poa_safe; if (t == Container_Types::COMPONENT_t || t == Container_Types::HOME_t) { - tmp = this->component_poa_.in (); + poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ()); } else { - tmp = this->facet_cons_poa_.in (); + poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ()); } - PortableServer::ObjectId_var tmp_id = tmp->activate_object (p); - CORBA::Object_var objref = tmp->id_to_reference (tmp_id.in ()); + PortableServer::ObjectId_var tmp_id = poa_safe->activate_object (p); + CORBA::Object_var objref = poa_safe->id_to_reference (tmp_id.in ()); oid = tmp_id._retn (); return objref._retn (); @@ -118,19 +119,22 @@ namespace CIAO { CIAO_TRACE ("Container_i::uninstall"); - PortableServer::ServantBase_var svnt; + PortableServer::POA_var poa_safe; switch (y) { case Container_Types::COMPONENT_t: case Container_Types::HOME_t: - svnt = this->component_poa_->reference_to_servant (objref); + poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in()); break; default: - svnt = this->facet_cons_poa_->reference_to_servant (objref); + poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in()); break; } + PortableServer::ServantBase_var svnt = + poa_safe->reference_to_servant (objref); + PortableServer::ObjectId_var oid; this->uninstall_servant (svnt.in (), y, oid.out ()); } @@ -317,8 +321,10 @@ namespace CIAO { CIAO_TRACE ("Container_i::uninstall_component"); + PortableServer::POA_var poa_safe = + PortableServer::POA::_duplicate(this->component_poa_.in ()); PortableServer::ServantBase_var srv_tmp = - this->component_poa_->reference_to_servant (homeref); + poa_safe->reference_to_servant (homeref); CIAO::Connector_Servant_Impl_Base * svnt = dynamic_cast <CIAO::Connector_Servant_Impl_Base *> ( srv_tmp.in ()); @@ -348,7 +354,7 @@ namespace CIAO { CIAO_TRACE ("Container_i::uninstall_servant"); - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); + PortableServer::POA_var poa_safe; if ((t == Container_Types::COMPONENT_t) || (t == Container_Types::HOME_t)) @@ -359,7 +365,7 @@ namespace CIAO "Container_i::uninstall_servant - " "Removing component or home servant\n")); - tmp = this->component_poa_.in (); + poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ()); } else { @@ -369,13 +375,13 @@ namespace CIAO "Container_i::uninstall_servant - " "Removing facet or consumer servant\n")); - tmp = this->facet_cons_poa_.in (); + poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ()); } try { - PortableServer::ObjectId_var tmp_id = tmp->servant_to_id (svnt); - tmp->deactivate_object (tmp_id); + PortableServer::ObjectId_var tmp_id = poa_safe->servant_to_id (svnt); + poa_safe->deactivate_object (tmp_id); CIAO_DEBUG (9, (LM_TRACE, @@ -410,14 +416,15 @@ namespace CIAO try { - + PortableServer::POA_var poa_safe = + PortableServer::POA::_duplicate(this->component_poa_.in ()); CIAO::Connector_Servant_Impl_Base * svt = 0; PortableServer::ServantBase_var servant_from_reference; try { servant_from_reference = - this->component_poa_->reference_to_servant (compref); + poa_safe->reference_to_servant (compref); svt = dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( servant_from_reference.in ()); @@ -488,13 +495,15 @@ namespace CIAO try { + PortableServer::POA_var poa_safe = + PortableServer::POA::_duplicate(this->component_poa_.in ()); CIAO::Connector_Servant_Impl_Base * svt = 0; PortableServer::ServantBase_var servant_from_reference; try { servant_from_reference = - this->component_poa_->reference_to_servant (compref); + poa_safe->reference_to_servant (compref); svt = dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( servant_from_reference.in ()); @@ -561,7 +570,9 @@ namespace CIAO try { - svt = this->component_poa_->reference_to_servant (compref); + PortableServer::POA_var poa_safe = + PortableServer::POA::_duplicate(this->component_poa_.in ()); + svt = poa_safe->reference_to_servant (compref); } catch (CORBA::Exception &ex) { @@ -587,7 +598,7 @@ namespace CIAO "exception while retrieving servant."); } - if (!svt) + if (CORBA::is_nil (svt.in ())) { CIAO_ERROR (1, (LM_EMERGENCY, CLINFO "Container_i::set_attributes - %C\n" @@ -745,32 +756,19 @@ namespace CIAO PortableServer::POAManager_var poa_manager = root->the_POAManager (); - TAO::Utils::PolicyList_Destroyer policies (3); - policies.length (3); + TAO::Utils::PolicyList_Destroyer policies (2); + policies.length (2); policies[0] = root->create_id_assignment_policy (PortableServer::USER_ID); - - // Servant Manager Policy - policies[1] = - root->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER); - // Servant Retention Policy - policies[2] = + policies[1] = root->create_servant_retention_policy (PortableServer::RETAIN); this->facet_cons_poa_ = root->create_POA (name, poa_manager.in (), policies); - - Servant_Activator_i *sa = 0; - ACE_NEW_THROW_EX (sa, - Servant_Activator_i (this->orb_.in ()), - CORBA::NO_MEMORY ()); - this->sa_ = sa; - - this->facet_cons_poa_->set_servant_manager (this->sa_.in ()); } template <typename BASE> @@ -794,10 +792,12 @@ namespace CIAO throw ::Components::InvalidConnection (); } + PortableServer::POA_var poa_safe = + PortableServer::POA::_duplicate(this->component_poa_.in ()); try { PortableServer::ServantBase_var provider_tmp = - this->component_poa_->reference_to_servant (provider); + poa_safe->reference_to_servant (provider); CIAO_DEBUG (9, (LM_TRACE, @@ -822,7 +822,7 @@ namespace CIAO } PortableServer::ServantBase_var user_tmp = - this->component_poa_->reference_to_servant (user); + poa_safe->reference_to_servant (user); CIAO_DEBUG (9, (LM_TRACE, CLINFO "Container_i::connect_local_facet - " "Successfully fetched user servant [%C] from POA\n", user_port)); @@ -933,8 +933,10 @@ namespace CIAO try { + PortableServer::POA_var poa_safe = + PortableServer::POA::_duplicate(this->component_poa_.in ()); PortableServer::ServantBase_var srv_tmp = - this->component_poa_->reference_to_servant (provider); + poa_safe->reference_to_servant (provider); CIAO_DEBUG (9, (LM_TRACE, @@ -957,7 +959,7 @@ namespace CIAO throw ::Components::InvalidConnection (); } - srv_tmp = this->component_poa_->reference_to_servant (user); + srv_tmp = poa_safe->reference_to_servant (user); CIAO_DEBUG (9, (LM_TRACE, @@ -1039,14 +1041,9 @@ namespace CIAO ::CORBA::Object_ptr Container_i<BASE>::get_objref (PortableServer::Servant p) { - return this->component_poa_->servant_to_reference (p); - } - - template <typename BASE> - ::CIAO::Servant_Activator_ptr - Container_i<BASE>::ports_servant_activator (void) - { - return Servant_Activator::_duplicate(this->sa_.in ()); + PortableServer::POA_var poa_safe = + PortableServer::POA::_duplicate(this->component_poa_.in ()); + return poa_safe->servant_to_reference (p); } template <typename BASE> @@ -1057,16 +1054,16 @@ namespace CIAO { CIAO_TRACE ("Container_i::generate_reference"); - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); + PortableServer::POA_var poa_safe; if (t == Container_Types::COMPONENT_t || t == Container_Types::HOME_t) { - tmp = this->component_poa_.in (); + poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ()); } else { - tmp = this->facet_cons_poa_.in (); + poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ()); } PortableServer::ObjectId_var oid = @@ -1076,7 +1073,7 @@ namespace CIAO PortableServer::ObjectId_to_string (oid.in ()); CORBA::Object_var objref = - tmp->create_reference_with_id (oid.in (), repo_id); + poa_safe->create_reference_with_id (oid.in (), repo_id); return objref._retn (); } diff --git a/CIAO/ciao/Containers/Container_Base_T.h b/CIAO/ciao/Containers/Container_Base_T.h index 008522be09d..3e7e7db766d 100644 --- a/CIAO/ciao/Containers/Container_Base_T.h +++ b/CIAO/ciao/Containers/Container_Base_T.h @@ -111,10 +111,6 @@ namespace CIAO Container_Types::OA_Type type, PortableServer::ObjectId_out oid); - /// Return the servant activator factory that activates the - /// servants for facets and consumers. - virtual ::CIAO::Servant_Activator_ptr ports_servant_activator (void); - virtual CORBA::Object_ptr get_objref (PortableServer::Servant p); /// Analog of the POA method that creates an object reference from @@ -147,10 +143,6 @@ namespace CIAO */ PortableServer::POA_var facet_cons_poa_; - /// The servant activator factory used to activate facets and - /// consumer servants. - Servant_Activator_var sa_; - /// Uninstall a servant for component or home. void uninstall (CORBA::Object_ptr objref, Container_Types::OA_Type t); diff --git a/CIAO/ciao/Containers/Containers.mpc b/CIAO/ciao/Containers/Containers.mpc index 6c360184f16..727f1aeb249 100644 --- a/CIAO/ciao/Containers/Containers.mpc +++ b/CIAO/ciao/Containers/Containers.mpc @@ -14,8 +14,7 @@ project(CIAO_Container_Base_idl) : install, taoidldefaults { install_dir = ciao/Containers } } - -project(CIAO_Container_Base_stub) : install, ciao_lib, ccm_svnt, ciao_servant_activator_stub, ciao_port_activator_stub { +project(CIAO_Container_Base_stub) : install, ciao_lib, ccm_svnt { after += CIAO_Container_Base_idl dynamicflags += CIAO_CONTAINER_BASE_BUILD_DLL diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.h b/CIAO/ciao/Containers/Extension/Extension_Container.h index 8b8ca2f4591..657d4241ab4 100644 --- a/CIAO/ciao/Containers/Extension/Extension_Container.h +++ b/CIAO/ciao/Containers/Extension/Extension_Container.h @@ -38,8 +38,6 @@ namespace CIAO class ServerContainerInterceptorRegistration_Impl; class StubContainerInterceptorRegistration_Impl; - class Servant_Activator; - typedef ::Components::HomeExecutorBase_ptr (*HomeFactory) (void); typedef ::PortableServer::Servant (*HomeServantFactory) (::Components::HomeExecutorBase_ptr p, ::CIAO::Extension_Container_ptr c, @@ -49,35 +47,6 @@ namespace CIAO ::CIAO::Extension_Container_ptr, const char *); - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - HomeFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - HOMECREATOR_FUNCPTR_MAP; - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - HomeServantFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - HOMESERVANTCREATOR_FUNCPTR_MAP; - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - ComponentFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - COMPONENTCREATOR_FUNCPTR_MAP; - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - ComponentServantFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - COMPONENTSERVANTCREATOR_FUNCPTR_MAP; - - class EXTENSION_CONTAINER_Export Extension_Container_i : public Container_i < ::CIAO::Extension_Container> { diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.mpc b/CIAO/ciao/Containers/Extension/Extension_Container.mpc index 8aa548c955d..b73ee9e63a5 100644 --- a/CIAO/ciao/Containers/Extension/Extension_Container.mpc +++ b/CIAO/ciao/Containers/Extension/Extension_Container.mpc @@ -17,7 +17,7 @@ project(CIAO_Extension_Container_idl) : install, ciaoidldefaults { } project(CIAO_Extension_Container_stub) : install, ccm_stub, ciao_lib, ciao_container_base_stub, utils, ciao_base, \ - ciao_servant_activator_stub { + { after += CIAO_Extension_Container_idl dynamicflags += EXTENSION_CONTAINER_STUB_BUILD_DLL @@ -37,9 +37,8 @@ project(CIAO_Extension_Container_stub) : install, ccm_stub, ciao_lib, ciao_conta install_dir = ciao/Containers/Extension } } - project(CIAO_Extension_Container) : install, ccm_svnt, ciao_lib, ciao_extension_container_stub, utils, \ - ciao_base, ciao_servant_activator, \ + ciao_base, \ ciao_servant, ccm_extension_stub, portableserver { after += CIAO_Extension_Container_idl dynamicflags += EXTENSION_CONTAINER_BUILD_DLL diff --git a/CIAO/ciao/Containers/Extension/README b/CIAO/ciao/Containers/Extension/README new file mode 100644 index 00000000000..04a9ae87a05 --- /dev/null +++ b/CIAO/ciao/Containers/Extension/README @@ -0,0 +1,4 @@ +$Id$ + +CIAO Extension containers are incomplete, experimental and not thread safe. +They may not work as expected. diff --git a/CIAO/ciao/Containers/Servant_Activator.cpp b/CIAO/ciao/Containers/Servant_Activator.cpp deleted file mode 100644 index 7da2a332b71..00000000000 --- a/CIAO/ciao/Containers/Servant_Activator.cpp +++ /dev/null @@ -1,174 +0,0 @@ -// $Id$ - -#include "Servant_Activator.h" -#include "ciao/Logger/Log_Macros.h" -#include "tao/PortableServer/PortableServer_Functions.h" - -namespace CIAO -{ - Servant_Activator_i::Servant_Activator_i (CORBA::ORB_ptr o) - : orb_ (CORBA::ORB::_duplicate (o)), - slot_index_ (0) - { - } - - Servant_Activator_i::~Servant_Activator_i (void) - { - CIAO_TRACE ("Servant_Activator_i::~Servant_Activator_i"); - } - - bool - Servant_Activator_i::update_port_activator ( - const PortableServer::ObjectId &oid) - { - CIAO_TRACE ("Servant_Activator_i::update_port_activator"); - - CORBA::String_var str = - PortableServer::ObjectId_to_string (oid); - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->mutex_, - CORBA::NO_RESOURCES ()); - - CIAO_DEBUG (6, (LM_INFO, CLINFO - "Servant_Activator_i::update_port_activator - " - "Attempting to update port name [%C]\n", - str.in ())); - - Port_Activators::iterator pa_iter = this->pa_.find (str.in ()); - - if (pa_iter != this->pa_.end ()) - { - this->pa_.erase (pa_iter); - } - else - { - return false; - } - } - - return true; - } - - PortableServer::Servant - Servant_Activator_i::incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr) - { - CIAO_TRACE ("Servant_Activator_i::incarnate"); - - CORBA::String_var str = - PortableServer::ObjectId_to_string (oid); - - CIAO_DEBUG (6, (LM_INFO, CLINFO - "Servant_Activator_i::incarnate - " - "Attempting to activate port name [%C]\n", - str.in ())); - - Port_Activators::iterator pa_iter; - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->mutex_, - CORBA::NO_RESOURCES ()); - - pa_iter = this->pa_.find (str.in ()); - } - - if (pa_iter == this->pa_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Servant_Activator_i::incarnate - " - "Unable to find suitable port activator for ObjectID %C\n", - str.in ())); - throw CORBA::OBJECT_NOT_EXIST (); - } - - if (CORBA::is_nil (pa_iter->second)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Servant_Activator_i::incarnate - " - "Port Activator for ObjectId %C was nil!\n", - str.in ())); - throw CORBA::OBJECT_NOT_EXIST (); - } - - CIAO_DEBUG (6, (LM_INFO, CLINFO - "Servant_Activator_i::incarnate - Activating Port %C\n", - str.in ())); - - return pa_iter->second->activate (oid); - } - - void - Servant_Activator_i::etherealize ( - const PortableServer::ObjectId &oid, - PortableServer::POA_ptr , - PortableServer::Servant servant, - CORBA::Boolean , - CORBA::Boolean remaining_activations) - { - CORBA::String_var str = - PortableServer::ObjectId_to_string (oid); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO "Servant_Activator_i::etherealize - " - "Attempting to etherealize servant with object ID %C\n", - str.in ())); - - Port_Activators::iterator pa_iter; - - { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->mutex_, - CORBA::NO_RESOURCES ()); - - pa_iter = this->pa_.find (str.in ()); - } - - if (pa_iter == this->pa_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Servant_Activator_i::etherealize - " - "Unable to find suitable port activator for ObjectID %C\n", - str.in ())); - throw CORBA::OBJECT_NOT_EXIST (); - } - - if (CORBA::is_nil (pa_iter->second)) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Servant_Activator_i::etherealize - " - "Port Activator for ObjectId %C was nil!\n", - str.in ())); - throw CORBA::OBJECT_NOT_EXIST (); - } - - pa_iter->second->deactivate (servant, remaining_activations); - } - - bool - Servant_Activator_i::register_port_activator (Port_Activator_ptr pa) - { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, - guard, - this->mutex_, - false); - CORBA::String_var safe_oid (pa->oid ()); - ::CORBA::String_var safe_name (pa->name ()); - CIAO_DEBUG (6, (LM_INFO, CLINFO "Servant_Activator_i::register_port_activator - " - "Registering a port activator for port [%C] with ObjectID [%C]\n", - safe_name.in (), safe_oid. in ())); - - try - { - this->pa_ [safe_oid.in ()] = Port_Activator::_duplicate (pa); - } - catch (...) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Servant_Activator_i::register_port_activator - " - "Unable to register a port activator for port [%C] with ObjectID [%C]\n", - pa->name (), pa->oid ())); - return false; - } - - return true; - } -} diff --git a/CIAO/ciao/Containers/Servant_Activator.h b/CIAO/ciao/Containers/Servant_Activator.h deleted file mode 100644 index 51be9f118ae..00000000000 --- a/CIAO/ciao/Containers/Servant_Activator.h +++ /dev/null @@ -1,98 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Servant_Activator.h - * - * $Id$ - * - * @authors Balachandran Natarajan <bala@dre.vanderbilt.edu> - */ -//============================================================================= - -#ifndef CIAO_SERVANT_ACTIVATOR_H -#define CIAO_SERVANT_ACTIVATOR_H - -#include /**/ "ace/pre.h" - -#include "CIAO_Servant_Activator_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/ServantActivatorC.h" -#include "tao/LocalObject.h" -#include "ciao/Containers/CIAO_Servant_ActivatorC.h" - -#include <map> -#include <string> - -namespace CIAO -{ - class Port_Activator; - - /** - * @class Servant_Activator - * - * @brief Activator that is registered with the POA for facet and - * consumer servants. - * - * This class acts like a factory in some sense. This factory is - * registered with the POA with RETAIN policy. When the factory gets - * a call back as part of the upcall, this factory looks at the - * list of port activators registered, uses the OID to pick the - * right one (yes a linear algorithm is used), calls activate () on - * it which returns the servant for *that* port. - */ - class CIAO_SERVANT_ACTIVATOR_Export Servant_Activator_i - : public virtual ::CIAO::Servant_Activator, - public virtual ::CORBA::LocalObject - { - public: - Servant_Activator_i (CORBA::ORB_ptr o); - - virtual ~Servant_Activator_i (void); - - virtual ::CORBA::Boolean update_port_activator ( - const ::PortableServer::ObjectId &oid); - - virtual ::CORBA::Boolean register_port_activator ( - ::CIAO::Port_Activator_ptr pa); - - /// Template methods overridden to get callbacks. - /** - * If you would like to know the details of the following two - * methods, please PortableServer documentation. This is probably - * not the place to document what these mean. - */ - virtual PortableServer::Servant incarnate ( - const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa); - - virtual void etherealize (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr adapter, - PortableServer::Servant servant, - CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations); - - private: - /// Pointer to our ORB - CORBA::ORB_var orb_; - - typedef std::map <std::string, Port_Activator_var> Port_Activators; - - /// Array of port activators - Port_Activators pa_; - - /// Running index of the slot that has been just filled in. - size_t slot_index_; - - /// Mutex that synchronizes access to the array. - TAO_SYNCH_MUTEX mutex_; - }; -} - -#include /**/ "ace/post.h" - -#endif /*CIAO_SERVANT_ACTIVATOR_H*/ diff --git a/CIAO/ciao/Containers/Session/Session_Container.h b/CIAO/ciao/Containers/Session/Session_Container.h index 72829454b0e..d25d1cd3878 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.h +++ b/CIAO/ciao/Containers/Session/Session_Container.h @@ -40,35 +40,6 @@ namespace CIAO ::CIAO::Session_Container_ptr, const char *); - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - HomeFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - HOMECREATOR_FUNCPTR_MAP; - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - HomeServantFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - HOMESERVANTCREATOR_FUNCPTR_MAP; - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - ComponentFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - COMPONENTCREATOR_FUNCPTR_MAP; - - typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - ComponentServantFactory, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> - COMPONENTSERVANTCREATOR_FUNCPTR_MAP; - - class SESSION_CONTAINER_Export Session_Container_i : public Container_i < ::CIAO::Session_Container> { diff --git a/CIAO/ciao/Containers/Session/Session_Container.mpc b/CIAO/ciao/Containers/Session/Session_Container.mpc index 45e500e93e7..9180d8d26bb 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.mpc +++ b/CIAO/ciao/Containers/Session/Session_Container.mpc @@ -15,9 +15,9 @@ project(CIAO_Session_Container_idl) : install, ciaoidldefaults { install_dir = ciao/Containers/Session } } - -project(CIAO_Session_Container_stub) : install, ccm_stub, ciao_lib, ciao_container_base_stub, utils, ciao_base, \ - ciao_servant_activator_stub { +project(CIAO_Session_Container_stub) : install, ccm_stub, ciao_lib, ciao_container_base_stub, utils, \ + ciao_base { + after += CIAO_Session_Container_idl dynamicflags += SESSION_CONTAINER_STUB_BUILD_DLL @@ -39,7 +39,8 @@ project(CIAO_Session_Container_stub) : install, ccm_stub, ciao_lib, ciao_contain } project(CIAO_Session_Container) : install, ccm_svnt, ciao_lib, utils, ciao_base, \ - ciao_servant_activator, ciao_servant, ciao_session_container_stub { + ciao_servant, ciao_session_container_stub { + after += CIAO_Session_Container_idl dynamicflags += SESSION_CONTAINER_BUILD_DLL diff --git a/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp b/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp index 4654d054eae..5cdb617d469 100644 --- a/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp +++ b/CIAO/ciao/Contexts/Context_Impl_Base_T.cpp @@ -3,6 +3,8 @@ #ifndef CIAO_CONTEXT_IMPL_BASE_T_C #define CIAO_CONTEXT_IMPL_BASE_T_C +#include "ciao/Logger/Log_Macros.h" + namespace CIAO { template <typename CONTAINER_TYPE> @@ -78,7 +80,18 @@ namespace CIAO CORBA::Object_ptr Context_Impl_Base_T<CONTAINER_TYPE>::resolve_service_reference(const char *service_id) { - return this->container_->resolve_service_reference (service_id); + typename CONTAINER_TYPE::_var_type cnt_safe = + CONTAINER_TYPE::_duplicate (this->container_.in ()); + if (::CORBA::is_nil (cnt_safe.in ())) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Extension_Context_Impl::get_client_interceptor_registration - " + "Error: Container is nil\n")); + throw ::CORBA::INV_OBJREF (); + } + return cnt_safe->resolve_service_reference (service_id); } template <typename CONTAINER_TYPE> diff --git a/CIAO/ciao/Contexts/Extension/Extension_Context_T.cpp b/CIAO/ciao/Contexts/Extension/Extension_Context_T.cpp index f31f3e66770..df2fd3d9eb8 100644 --- a/CIAO/ciao/Contexts/Extension/Extension_Context_T.cpp +++ b/CIAO/ciao/Contexts/Extension/Extension_Context_T.cpp @@ -28,7 +28,9 @@ namespace CIAO ::Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration_ptr Extension_Context_Impl<BASE_CTX, COMP>::get_client_interceptor_registration (void) { - return this->container_->get_client_interceptor_registration (); + ::CIAO::Extension_Container_var cnt_safe = + ::CIAO::Extension_Container::_duplicate (this->container_.in ()); + return cnt_safe->get_client_interceptor_registration (); } template <typename BASE_CTX, @@ -36,7 +38,9 @@ namespace CIAO ::Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration_ptr Extension_Context_Impl<BASE_CTX, COMP>::get_servant_interceptor_registration (void) { - return this->container_->get_servant_interceptor_registration (); + ::CIAO::Extension_Container_var cnt_safe = + ::CIAO::Extension_Container::_duplicate (this->container_.in ()); + return cnt_safe->get_servant_interceptor_registration (); } template <typename BASE_CTX, @@ -44,7 +48,9 @@ namespace CIAO ::Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration_ptr Extension_Context_Impl<BASE_CTX, COMP>::get_server_interceptor_registration (void) { - return this->container_->get_server_interceptor_registration (); + ::CIAO::Extension_Container_var cnt_safe = + ::CIAO::Extension_Container::_duplicate (this->container_.in ()); + return cnt_safe->get_server_interceptor_registration (); } template <typename BASE_CTX, @@ -52,7 +58,9 @@ namespace CIAO ::Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration_ptr Extension_Context_Impl<BASE_CTX, COMP>::get_stub_interceptor_registration (void) { - return this->container_->get_stub_interceptor_registration (); + ::CIAO::Extension_Container_var cnt_safe = + ::CIAO::Extension_Container::_duplicate (this->container_.in ()); + return cnt_safe->get_stub_interceptor_registration (); } template <typename BASE_CTX, @@ -62,8 +70,10 @@ namespace CIAO const char * service_id, ::CORBA::Object_ptr objref) { - return this->container_->install_service_reference (service_id, - objref); + ::CIAO::Extension_Container_var cnt_safe = + ::CIAO::Extension_Container::_duplicate (this->container_.in ()); + return cnt_safe->install_service_reference (service_id, + objref); } template <typename BASE_CTX, @@ -72,7 +82,9 @@ namespace CIAO Extension_Context_Impl<BASE_CTX, COMP>::uninstall_service_reference ( ::Components::Cookie * ck) { - return this->container_->uninstall_service_reference (ck); + ::CIAO::Extension_Container_var cnt_safe = + ::CIAO::Extension_Container::_duplicate (this->container_.in ()); + return cnt_safe->uninstall_service_reference (ck); } } diff --git a/CIAO/ciao/Contexts/Extension/README b/CIAO/ciao/Contexts/Extension/README new file mode 100644 index 00000000000..04a9ae87a05 --- /dev/null +++ b/CIAO/ciao/Contexts/Extension/README @@ -0,0 +1,4 @@ +$Id$ + +CIAO Extension containers are incomplete, experimental and not thread safe. +They may not work as expected. diff --git a/CIAO/ciao/Contexts/Session/Session_Context_T.cpp b/CIAO/ciao/Contexts/Session/Session_Context_T.cpp index 36d5c7914ab..a54bbe60263 100644 --- a/CIAO/ciao/Contexts/Session/Session_Context_T.cpp +++ b/CIAO/ciao/Contexts/Session/Session_Context_T.cpp @@ -32,7 +32,18 @@ namespace CIAO try { - obj = this->container_->get_objref (this->servant_); + ::CIAO::Session_Container_var cnt_safe = + ::CIAO::Session_Container::_duplicate (this->container_.in ()); + if (::CORBA::is_nil (cnt_safe.in ())) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Session_Context_Impl::get_CCM_object - " + "Error: Container is nil\n")); + throw ::CORBA::INV_OBJREF (); + } + obj = cnt_safe->get_objref (this->servant_); } catch (const CORBA::Exception& ex) { diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp index 242c5e03045..f1ea6cfc72d 100644 --- a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp +++ b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp @@ -12,8 +12,10 @@ namespace CIAO const ::Deployment::DeploymentPlan &plan) { if (name == 0) - throw ::Deployment::PlanError (name, - "No such artifact"); + { + throw ::Deployment::PlanError (name, + "No such artifact"); + } for (CORBA::ULong i = 0; i < plan.artifact.length (); @@ -24,7 +26,9 @@ namespace CIAO { if (plan.artifact[i].location.length () >= 1 && plan.artifact[i].location[0] != 0) - return plan.artifact[i].location[0].in (); + { + return plan.artifact[i].location[0].in (); + } else { CIAO_ERROR (1, (LM_ERROR, CLINFO diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp index 97c58878251..63661bd3285 100644 --- a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp +++ b/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp @@ -20,6 +20,11 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::add_container"); + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->container_mutex_, + CORBA::NO_RESOURCES ()); + if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. this->containers_.find (id) != this->containers_.end ()) { @@ -35,10 +40,18 @@ namespace CIAO Deployment_State::remove_container (const char *id) { CIAO_TRACE ("Deployment_State::remove_container"); + + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->container_mutex_, + CORBA::NO_RESOURCES ()); + CONTAINERS::iterator pos = this->containers_.find (id); if (pos != this->containers_.end ()) - this->containers_.erase (pos); + { + this->containers_.erase (pos); + } } CIAO::Container_ptr @@ -46,6 +59,11 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::fetch_container"); + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->container_mutex_, + CORBA::NO_RESOURCES ()); + CONTAINERS::iterator pos = this->containers_.find (id); if (pos == this->containers_.end ()) @@ -63,33 +81,62 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::add_home"); - if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. - this->homes_.find (id) != this->homes_.end ()) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Deployment_State::add_home - " - "Warning: Attempting to add duplicate home reference\n")); - } - - this->instance_container_[id] = cont_id; - this->homes_[id] = Components::CCMHome::_duplicate (home); + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->home_mutex_, + CORBA::NO_RESOURCES ()); + + if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. + this->homes_.find (id) != this->homes_.end ()) + { + CIAO_ERROR (1, (LM_WARNING, CLINFO + "Deployment_State::add_home - " + "Warning: Attempting to add duplicate home reference\n")); + } + this->homes_[id] = Components::CCMHome::_duplicate (home); + } + + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instance_container_mutex_, + CORBA::NO_RESOURCES ()); + this->instance_container_[id] = cont_id; + } } void Deployment_State::remove_home (const char *id) { CIAO_TRACE ("Deployment_State::remove_home"); - - HOMES::iterator pos = this->homes_.find (id); - - if (pos != this->homes_.end ()) - this->homes_.erase (pos); - - INSTANCE_CONTAINER::iterator cont = - this->instance_container_.find (id); - - if (cont != this->instance_container_.end ()) - this->instance_container_.erase (cont); + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->home_mutex_, + CORBA::NO_RESOURCES ()); + + HOMES::iterator pos = this->homes_.find (id); + + if (pos != this->homes_.end ()) + { + this->homes_.erase (pos); + } + } + + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instance_container_mutex_, + CORBA::NO_RESOURCES ()); + INSTANCE_CONTAINER::iterator cont = + this->instance_container_.find (id); + + if (cont != this->instance_container_.end ()) + { + this->instance_container_.erase (cont); + } + } } Components::CCMHome_ptr @@ -97,9 +144,18 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::fetch_home"); + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->home_mutex_, + CORBA::NO_RESOURCES ()); + HOMES::iterator pos = this->homes_.find (id); - if (pos == this->homes_.end ()) return Components::CCMHome::_nil (); + if (pos == this->homes_.end ()) + { + return Components::CCMHome::_nil (); + } + return Components::CCMHome::_duplicate (pos->second.in ()); } @@ -110,16 +166,28 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::add_component"); - if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. - this->components_.find (id) != this->components_.end ()) - { - CIAO_ERROR (1, (LM_WARNING, CLINFO - "Deployment_State::add_component - " - "Warning: Attempting to add duplicate component reference\n")); - } - - this->instance_container_[id] = cont_id; - this->components_[id] = Components::CCMObject::_duplicate (component); + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->component_mutex_, + CORBA::NO_RESOURCES ()); + + if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. + this->components_.find (id) != this->components_.end ()) + { + CIAO_ERROR (1, (LM_WARNING, CLINFO + "Deployment_State::add_component - " + "Warning: Attempting to add duplicate component reference\n")); + } + this->components_[id] = Components::CCMObject::_duplicate (component); + } + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instance_container_mutex_, + CORBA::NO_RESOURCES ()); + this->instance_container_[id] = cont_id; + } } void @@ -127,16 +195,32 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::remove_component"); - COMPONENTS::iterator pos = this->components_.find (id); - - if (pos != this->components_.end ()) - this->components_.erase (pos); - - INSTANCE_CONTAINER::iterator cont = - this->instance_container_.find (id); - - if (cont != this->instance_container_.end ()) - this->instance_container_.erase (cont); + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->component_mutex_, + CORBA::NO_RESOURCES ()); + COMPONENTS::iterator pos = this->components_.find (id); + + if (pos != this->components_.end ()) + { + this->components_.erase (pos); + } + } + + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instance_container_mutex_, + CORBA::NO_RESOURCES ()); + INSTANCE_CONTAINER::iterator cont = + this->instance_container_.find (id); + + if (cont != this->instance_container_.end ()) + { + this->instance_container_.erase (cont); + } + } } Components::CCMObject_ptr @@ -144,6 +228,11 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::fetch_component"); + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->component_mutex_, + CORBA::NO_RESOURCES ()); + COMPONENTS::iterator pos = this->components_.find (id); if (pos == this->components_.end ()) @@ -159,11 +248,17 @@ namespace CIAO { CIAO_TRACE ("Deployment_State::instance_to_container"); + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instance_container_mutex_, + CORBA::NO_RESOURCES ()); INSTANCE_CONTAINER::const_iterator cont = this->instance_container_.find (id); if (cont != this->instance_container_.end ()) - return cont->second.c_str (); + { + return cont->second.c_str (); + } CIAO_ERROR (1, (LM_ERROR, CLINFO "Deployment_State::instance_to_container - " diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_State.h b/CIAO/ciao/Deployment/Handlers/CIAO_State.h index cb1d81f7ba3..a63a3c90dd1 100644 --- a/CIAO/ciao/Deployment/Handlers/CIAO_State.h +++ b/CIAO/ciao/Deployment/Handlers/CIAO_State.h @@ -56,25 +56,36 @@ namespace CIAO Connection_Handler connection_handler; private: + /// Container administration typedef std::map < std::string, CIAO::Container_var > CONTAINERS; CONTAINERS containers_; + TAO_SYNCH_MUTEX container_mutex_; + typedef std::map < std::string, std::string > INSTANCE_CONTAINER; /// maps instance ids to containers. INSTANCE_CONTAINER instance_container_; + TAO_SYNCH_MUTEX instance_container_mutex_; + + /// Homes administration typedef std::map < std::string, Components::CCMHome_var > HOMES; HOMES homes_; + TAO_SYNCH_MUTEX home_mutex_; + + /// Components administration typedef std::map < std::string, Components::CCMObject_var > COMPONENTS; COMPONENTS components_; + + TAO_SYNCH_MUTEX component_mutex_; }; typedef ACE_Singleton <Deployment_State, diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp index 7cbe68f9c02..6973ffac406 100644 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp @@ -24,6 +24,10 @@ namespace CIAO void Component_Handler_i::close (void) { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); this->instances_.clear (); } @@ -45,7 +49,7 @@ namespace CIAO Component_Handler_i::instance_type (void) { CIAO_TRACE ("Component_Handler_i::instance_type"); - return CORBA::string_dup ("edu.dre.vanderbilt.dre.CCM.Component"); + return CORBA::string_dup (CIAO::Deployment::CCM_COMPONENT); } void @@ -257,7 +261,13 @@ namespace CIAO "Container provided nil object reference"); } - this->instances_[idd.name.in ()] = info; + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); + this->instances_[idd.name.in ()] = info; + } DEPLOYMENT_STATE::instance ()->add_component (idd.name.in (), cont_id, @@ -400,18 +410,24 @@ namespace CIAO CIAO_TRACE ("Component_Handler_i::remove_instance"); const char *name = plan.instance[instanceRef].name.in (); - Deployment_Common::INSTANCES::iterator instance - = this->instances_.find (name); - - if (instance == this->instances_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Component_Handler_i::remove_instance - " - "Instructed to remove unknown component instance <%C>\n", - name)); - throw ::Deployment::StopError (name, - "Wrong instance handler for component instance\n"); - } + Deployment_Common::INSTANCES::iterator instance; + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); + instance = this->instances_.find (name); + + if (instance == this->instances_.end ()) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Component_Handler_i::remove_instance - " + "Instructed to remove unknown component instance <%C>\n", + name)); + throw ::Deployment::StopError (name, + "Wrong instance handler for component instance\n"); + } + } CIAO_DEBUG (8, (LM_DEBUG, CLINFO "Component_Handler_i::remove_instance - " @@ -477,7 +493,13 @@ namespace CIAO "Unknown C++ exception\n"); } - this->instances_.erase (instance); + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); + this->instances_.erase (instance); + } DEPLOYMENT_STATE::instance ()->remove_component (name); CIAO_DEBUG (4, (LM_INFO, CLINFO diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.h b/CIAO/ciao/Deployment/Handlers/Component_Handler.h index 6e79c725ef9..c47fb7da00a 100644 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.h @@ -88,6 +88,7 @@ namespace CIAO private: Deployment_Common::INSTANCES instances_; + TAO_SYNCH_MUTEX instances_mutex_; }; } diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp index 2e5c0a2e614..421ba9e9128 100644 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp @@ -276,7 +276,7 @@ namespace CIAO } else { - //only because of the receptacle is an external endpoint + //only because the receptacle is an external endpoint this->disconnect_non_local (conn, conn.externalReference[0].portName.in ()); } break; @@ -320,7 +320,7 @@ namespace CIAO // pass through throw; } - // Since DANCE shutdown the Locality managers simultaniously, + // Since DANCE shuts down the Locality managers simultaniously, // it could be that one locality manager is shutdown while the // other wants to disconnect from this locality manager. Therefor // we catch an OBJECT_NOT_EXIST, TRANSIENT and a COMM_FAILURE at this point @@ -436,6 +436,10 @@ namespace CIAO ::Components::Cookie_var cookie = provided->connect (conn.externalReference[0].portName.in (), facet.in ()); +#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) + this->validate_connection(conn.name.in (), facet.in ()); +#endif + CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_non_local_facet - " "Connection <%C> successfully established.\n", @@ -509,6 +513,10 @@ namespace CIAO ::Components::Cookie_var cookie = receptacle->connect (endpoint.portName.in (), provided.in ()); +#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) + this->validate_connection(conn.name.in (), provided.in ()); +#endif + CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_non_local_receptacle - " "Connection <%C> successfully established.\n", @@ -597,6 +605,9 @@ namespace CIAO } Components::Cookie_var cookie = publisher->subscribe (endpoint.portName.in (), event.in ()); +#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) + this->validate_connection(conn.name.in (), publisher.in()); +#endif CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_publisher - " @@ -704,6 +715,10 @@ namespace CIAO conn.externalReference[0].portName.in ())); } +#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) + this->validate_connection(conn.name.in (), event.in()); +#endif + CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_consumer - " "Connection <%C> successfully established.\n", @@ -775,6 +790,9 @@ namespace CIAO emitter->connect_consumer (endpoint.portName.in (), event.in ()); +#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) + this->validate_connection(conn.name.in (), emitter.in()); +#endif CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_emitter - " @@ -796,9 +814,14 @@ namespace CIAO CIAO_TRACE ("Connection_Handler::disconnect_non_local"); ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); + CIAO_DEBUG (6, (LM_DEBUG, CLINFO + "Connection_Handler::disconnect_non_local - " + "About to disconnect <%C>\n", + conn.name.in())); ::CORBA::Object_var safe_tmp = obj->disconnect (port_name, this->get_cookie (conn.name.in ())); + this->remove_cookie (conn.name.in ()); } @@ -972,6 +995,9 @@ namespace CIAO facet_endpoint.portName.in (), receptacle, receptacle_endpoint.portName.in ()); +#if defined (CIAO_PRE_ESTABLISH_CONNECTIONS) + this->validate_connection(conn.name.in (), facet); +#endif CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_local_port - " "Connected local port <%C>:<%C> to <%C>:<%C>\n", @@ -1062,6 +1088,36 @@ namespace CIAO receptacle_endpoint.portName.in ())); } + void + Connection_Handler::validate_connection (const char * conn, + ::CORBA::Object_ptr obj) + { + CIAO_TRACE ("Connection_Handler::validate_connection"); + try + { + if (!::CORBA::is_nil (obj)) + { + ::CORBA::PolicyList_var pl; + if (obj->_validate_connection (pl.out ())) + { + CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Connection_Handler::validate_connection - " + "Succesfully validated connection <%C>. Connection has been pre-established.\n", + conn)); + } + else + { + CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::validate_connection - " + "Failed to pre-establish a connection <%C>.\n", + conn)); + } + } + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("Connection_Handler::validate_connection"); + } + } + bool Connection_Handler::is_local_connection (const ::Deployment::PlanConnectionDescription &conn) { @@ -1085,10 +1141,18 @@ namespace CIAO { CIAO_TRACE ("Connection_Handler::insert_cookie"); - std::pair <std::string, CONNECTION_INFO> value_to_insert (connection_name, - conn_info); - std::pair<COOKIES::iterator, bool> ret = this->cookies_.insert (value_to_insert); - if (!ret.second) + std::pair<COOKIES::iterator, bool> result; + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->cookies_mutex_, + CORBA::NO_RESOURCES ()); + + std::pair <std::string, CONNECTION_INFO> value_to_insert (connection_name, + conn_info); + result = this->cookies_.insert (value_to_insert); + } + if (!result.second) { CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::insert_cookie - " @@ -1112,6 +1176,11 @@ namespace CIAO { CIAO_TRACE ("Connection_Handler::remove_cookie"); + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->cookies_mutex_, + CORBA::NO_RESOURCES ()); + COOKIES::iterator it = this->cookies_.find (connection_name); if (it == this->cookies_.end ()) { @@ -1134,6 +1203,11 @@ namespace CIAO { CIAO_TRACE ("Connection_Handler::get_cookie"); + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->cookies_mutex_, + CORBA::NO_RESOURCES ()); + COOKIES::iterator it = this->cookies_.find (connection_name); if (it == this->cookies_.end ()) { @@ -1157,16 +1231,24 @@ namespace CIAO ::Components::CCMObject_ptr Connection_Handler::get_ccm_object (const char * connection_name) { - COOKIES::iterator it = this->cookies_.find (connection_name); - if (it == this->cookies_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::get_ccm_object - " - "Cookie for <%C> not found\n", - connection_name)); - throw ::Deployment::InvalidConnection (connection_name, - "Unable to find correct cookie"); - } + CIAO_TRACE ("Connection_Handler::get_ccm_object"); + COOKIES::iterator it; + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->cookies_mutex_, + CORBA::NO_RESOURCES ()); + it = this->cookies_.find (connection_name); + if (it == this->cookies_.end ()) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::get_ccm_object - " + "Cookie for <%C> not found\n", + connection_name)); + throw ::Deployment::InvalidConnection (connection_name, + "Unable to find correct cookie"); + } + } ::Components::CCMObject_var ret = it->second.second; if (::CORBA::is_nil (ret.in ())) { @@ -1183,6 +1265,8 @@ namespace CIAO ::CORBA::ULong Connection_Handler::retrieve_endpoint (const ::Deployment::PlanConnectionDescription &conn) { + CIAO_TRACE ("Connection_Handler::retrieve_endpoint"); + if (conn.internalEndpoint.length () == 0) { CIAO_ERROR (1, (LM_ERROR, CLINFO diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h b/CIAO/ciao/Deployment/Handlers/Connection_Handler.h index 8238f2fe9a6..de4d22a7436 100644 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.h @@ -96,6 +96,9 @@ namespace CIAO bool is_local_connection (const ::Deployment::PlanConnectionDescription &conn); + void validate_connection (const char * conn, + ::CORBA::Object_ptr obj); + ::CORBA::ULong retrieve_endpoint (const ::Deployment::PlanConnectionDescription &conn); typedef std::pair < ::Components::Cookie_var, @@ -113,6 +116,8 @@ namespace CIAO ::Components::CCMObject_ptr get_ccm_object (const char * connection_name); COOKIES cookies_; + + TAO_SYNCH_MUTEX cookies_mutex_; }; } #endif diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp index 3c11b68161b..7d00837775d 100644 --- a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp @@ -3,6 +3,7 @@ #include "Container_Handler.h" #include "ciao/Logger/Log_Macros.h" #include "ciao/Logger/Logger_Service.h" +#include "ciao/Base/CIAO_PropertiesC.h" #ifdef DANCE_DEPLOYS_EXTENSION_CONTAINER #include "ciao/Containers/Extension/Extension_Container.h" #else @@ -79,7 +80,7 @@ namespace CIAO Container_Handler_i::instance_type (void) { CIAO_TRACE ("Container_Handler_i::instance_type"); - return CORBA::string_dup ("edu.dre.vanderbilt.dre.DAnCE.CCM.Container"); + return CORBA::string_dup (CIAO::Deployment::CCM_CONTAINER); } void @@ -279,7 +280,7 @@ namespace CIAO "Unable to locate POA"); } - CIAO::Server_init (orb_); + CIAO::Server_init (this->orb_); // For the time being, we are going to go ahead and construct a container. ::Deployment::DeploymentPlan plan; diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp index af873593ff6..2fec16f3e8b 100644 --- a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp @@ -22,6 +22,10 @@ namespace CIAO void Home_Handler_i::close (void) { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); this->instances_.clear (); } @@ -43,7 +47,7 @@ namespace CIAO Home_Handler_i::instance_type (void) { CIAO_TRACE ("Home_Handler_i::instance_type"); - return CORBA::string_dup ("edu.dre.vanderbilt.dre.CCM.Home"); + return CORBA::string_dup (CIAO::Deployment::CCM_HOME); } void @@ -253,8 +257,13 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Container provided nil object reference"); } - - this->instances_[idd.name.in ()] = info; + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); + this->instances_[idd.name.in ()] = info; + } DEPLOYMENT_STATE::instance ()->add_home (idd.name.in (), cont_id, home_ref.in ()); @@ -289,23 +298,29 @@ namespace CIAO CIAO_TRACE ("Home_Handler_i::remove_instance"); const char *name = plan.instance[instanceRef].name.in (); - Deployment_Common::INSTANCES::iterator instance - = this->instances_.find (name); - - if (instance == this->instances_.end ()) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Home_Handler_i::remove_instance - " - "Instructed to remove unknown home instance <%C>\n", - name)); - throw ::Deployment::StopError (name, - "Wrong instance handler for home instance\n"); - } - - CIAO_DEBUG (8, (LM_DEBUG, CLINFO - "Home_Handler_i::remove_instance - " - "Attempting removal of home instance <%C>\n", - name)); + Deployment_Common::INSTANCES::iterator instance; + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); + instance = this->instances_.find (name); + + if (instance == this->instances_.end ()) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Home_Handler_i::remove_instance - " + "Instructed to remove unknown home instance <%C>\n", + name)); + throw ::Deployment::StopError (name, + "Wrong instance handler for home instance\n"); + } + + CIAO_DEBUG (8, (LM_DEBUG, CLINFO + "Home_Handler_i::remove_instance - " + "Attempting removal of home instance <%C>\n", + name)); + } CORBA::Any val; const char *cont_id = 0; @@ -364,7 +379,13 @@ namespace CIAO "Unknown C++ exception\n"); } - this->instances_.erase (instance); + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + guard, + this->instances_mutex_, + CORBA::NO_RESOURCES ()); + this->instances_.erase (instance); + } CIAO_DEBUG (4, (LM_INFO, CLINFO "Home_Handler_i::remove_instance - " diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.h b/CIAO/ciao/Deployment/Handlers/Home_Handler.h index eb3eff5f5a4..c0fb632c29f 100644 --- a/CIAO/ciao/Deployment/Handlers/Home_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.h @@ -87,6 +87,7 @@ namespace CIAO private: Deployment_Common::INSTANCES instances_; + TAO_SYNCH_MUTEX instances_mutex_; }; } diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp index c2c82df40e4..8ace206582d 100644 --- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp @@ -45,7 +45,7 @@ namespace CIAO Homed_Component_Handler_i::instance_type (void) { CIAO_TRACE ("Homed_Component_Handler_i::instance_type"); - return CORBA::string_dup ("edu.vanderbilt.dre.CCM.HomedComponent"); + return CORBA::string_dup (CIAO::Deployment::CCM_HOMEDCOMPONENT); } void diff --git a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc index ff817cc208c..6e1dd990a85 100644 --- a/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc +++ b/CIAO/ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc @@ -1,5 +1,5 @@ // $Id$ -project (CIAO_Deployment_Interceptors) : ciao_base, ciao_lib, ciao_output, \ +project (CIAO_Deployment_Interceptors) : install, ciao_base, ciao_lib, ciao_output, \ naming, ciao_logger, dance_stub, dance_deployment_scheduler { dynamicflags += CIAO_DEPLOYMENT_INTERCEPTORS_BUILD_DLL @@ -12,4 +12,8 @@ project (CIAO_Deployment_Interceptors) : ciao_base, ciao_lib, ciao_output, \ Deployment_Interceptors.h Name_Utilities.h } + + specific { + install_dir = ciao/Deployment/Interceptors + } } diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp index 08ffebefa2f..4234ccbdbb0 100644 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp +++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp @@ -32,7 +32,7 @@ namespace CIAO } void CIAO_StoreReferences_i::pre_install (::Deployment::DeploymentPlan &, - ::CORBA::ULong) + ::CORBA::ULong) { // no-op } @@ -48,7 +48,7 @@ namespace CIAO CIAO_DEBUG (9, (LM_TRACE, CLINFO "CIAO_StoreReferences_i::post_install - " "Interceptor post install for instance %C\n", - plan.instance[index].name.in ())); + plan.instance[index].name.in ())); if (reference.type() == ::CORBA::_tc_null) { @@ -56,7 +56,7 @@ namespace CIAO "CIAO_StoreReferences_i::post_install - " "Got a nil reference, unable to store reference " "for instance <%C>\n", - inst.name.in ())); + inst.name.in ())); return; } @@ -82,12 +82,14 @@ namespace CIAO CIAO_DEBUG (9, (LM_TRACE, CLINFO "CIAO_StoreReferences_i::post_install - " "Registering name %C for instance %C\n", - name, - plan.instance[index].name.in ())); + name, + plan.instance[index].name.in ())); + ::CosNaming::NamingContext_var ctx_safe = + ::CosNaming::NamingContext::_duplicate (this->ctx_.in ()); Name_Utilities::bind_object (name, obj.in (), - this->ctx_.in ()); + ctx_safe.in ()); } else if (ACE_OS::strcmp (inst.configProperty[i].name.in (), DAnCE::INSTANCE_IOR_FILE) == 0) @@ -98,7 +100,9 @@ namespace CIAO const char * name = 0; inst.configProperty[i].value >>= CORBA::Any::to_string (name, 0); - CORBA::String_var ior = this->orb_->object_to_string (obj.in ()); + ::CORBA::ORB_var orb_safe = + ::CORBA::ORB::_duplicate(this->orb_.in ()); + CORBA::String_var ior = orb_safe->object_to_string (obj.in ()); CIAO::Name_Utilities::write_ior (ACE_TEXT_CHAR_TO_TCHAR (name), ior.in ()); } @@ -116,7 +120,7 @@ namespace CIAO CORBA::Object_var obj; props[i].value >>= CORBA::Any::to_object (obj); - ctx_ = CosNaming::NamingContext::_narrow (obj.in ()); + this->ctx_ = CosNaming::NamingContext::_narrow (obj.in ()); } } } @@ -124,6 +128,16 @@ namespace CIAO /// Implementation skeleton constructor CIAO_ReferenceLookup_i::CIAO_ReferenceLookup_i (void) { + this->orb_ = DAnCE::PLUGIN_MANAGER::instance ()->get_orb (); + + if (CORBA::is_nil (this->orb_)) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Container_Handler_i::configure -" + "Unable to locate ORB.\n")); + throw ::Deployment::StartError ("CIAO Container Handler", + "Unable to locate ORB"); + } } /// Implementation skeleton destructor @@ -132,10 +146,57 @@ namespace CIAO } void - CIAO_ReferenceLookup_i::pre_connect (::Deployment::DeploymentPlan &, - ::CORBA::ULong, - ::CORBA::Any &) + CIAO_ReferenceLookup_i::pre_connect (::Deployment::DeploymentPlan &plan, + ::CORBA::ULong connRef, + ::CORBA::Any &providedRef) { + CIAO_DEBUG (9, (LM_TRACE, CLINFO + "CIAO_ReferenceLookup_i::pre_connect - " + "Interceptor pre connect for connection %C\n", + plan.connection[connRef].name.in ())); + + // attempt to resolve CORBA IOR type external references + if (plan.connection[connRef].externalReference.length () > 0) + { + ::CORBA::Object_var obj; + providedRef >>= CORBA::Any::to_object (obj); + if (CORBA::is_nil (obj)) + { + try + { + obj = + this->orb_->string_to_object(plan.connection[connRef].externalReference[0].location.in()); + providedRef <<= obj; + } + catch (const CORBA::INV_OBJREF&) + { + CIAO_ERROR (6, (LM_INFO, CLINFO + "CIAO_ReferenceLookup_i::pre_connect - " + "Unable to resolve external reference for connection %C\n", + plan.connection[connRef].name.in ())); + } + catch (CORBA::Exception &ex) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "CIAO_ReferenceLookup_i::pre_connect - " + "Caught CORBA Exception while resolving external" + "reference for connection %C: %C\n", + plan.connection[connRef].name.in (), + ex._info ().c_str ())); + throw; + } + catch (...) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "CIAO_ReferenceLookup_i::pre_connect - " + "Caught C Exception while resolving external reference" + "for connection %C\n", + plan.connection[connRef].name.in ())); + throw; + } + } + } + } void CIAO_ReferenceLookup_i::post_connect (const ::Deployment::DeploymentPlan &, @@ -148,7 +209,7 @@ namespace CIAO CIAO_ReferenceLookup_i::configure (const ::Deployment::Properties & ) { } - } +} extern "C" { @@ -157,4 +218,10 @@ extern "C" { return new CIAO::CIAO_StoreReferences_i (); } + + ::DAnCE::DeploymentInterceptor_ptr + CIAO_Deployment_Interceptors_Export create_CIAO_ReferenceLookup (void) + { + return new CIAO::CIAO_ReferenceLookup_i (); + } } diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h index 5b792119e19..4318a511b2e 100644 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h +++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.h @@ -68,13 +68,22 @@ namespace CIAO virtual void configure(const Deployment::Properties&); + + protected: + CORBA::ORB_var orb_; }; } extern "C" { ::DAnCE::DeploymentInterceptor_ptr + CIAO_Deployment_Interceptors_Export create_CIAO_ReferenceLookup (void); + + ::DAnCE::DeploymentInterceptor_ptr CIAO_Deployment_Interceptors_Export create_CIAO_StoreReferences (void); + + ::DAnCE::DeploymentInterceptor_ptr + CIAO_Deployment_Interceptors_Export create_CIAO_ReferenceLookup (void); } #endif diff --git a/CIAO/ciao/Servants/CIAO_Port_Activator.idl b/CIAO/ciao/Servants/CIAO_Port_Activator.idl deleted file mode 100644 index 9d26f768260..00000000000 --- a/CIAO/ciao/Servants/CIAO_Port_Activator.idl +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file CIAO_Port_Activator.idl - * @author Wiliam R. Otte <wotte@dre.vanderbilt.edu - * $Id$ - * Local interface describing servant activators for component ports. - */ - -#ifndef CIAO_PORT_ACTIVATOR_IDL_ -#define CIAO_PORT_ACTIVATOR_IDL_ - -#include "tao/PortableServer/ServantActivator.pidl" - -module CIAO -{ - module Port_Activator_Types - { - enum Type - { - FACET, - SINK - }; - }; - - local interface Port_Activator - { - /// OID of port this activator encapsulates - attribute string oid; - - /// Name of the port - readonly attribute string name; - - PortableServer::Servant activate (in PortableServer::ObjectId oid); - - void deactivate (in PortableServer::Servant servant, - in boolean remaining_activations); - }; -}; - -#endif diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp index d9155d9a286..bbb297ee48a 100644 --- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp +++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp @@ -3,7 +3,6 @@ #include "Connector_Servant_Impl_Base.h" #include "StandardConfigurator_Impl.h" #include "ciao/Logger/Log_Macros.h" -#include "ciao/Containers/CIAO_Servant_ActivatorC.h" namespace CIAO { @@ -33,36 +32,33 @@ namespace CIAO try { - PortableServer::POA_var port_poa = - this->container_->the_port_POA (); + Container_var cnt_safe = Container::_duplicate(this->container_.in ()); + PortableServer::POA_var port_poa = cnt_safe->the_port_POA (); - // Removing Facets - for (FacetTable::const_iterator iter = - this->facet_table_.begin (); - iter != this->facet_table_.end (); - ++iter) - { - PortableServer::ObjectId_var facet_id = - port_poa->reference_to_id (iter->second); - - port_poa->deactivate_object (facet_id); - - CIAO::Servant_Activator_var sa = - this->container_->ports_servant_activator (); + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + mon, + this->lock_, + CORBA::NO_RESOURCES ()); + // Removing Facets + for (FacetTable::const_iterator iter = + this->facet_table_.begin (); + iter != this->facet_table_.end (); + ++iter) + { + PortableServer::ObjectId_var facet_id = + port_poa->reference_to_id (iter->second); - if (!CORBA::is_nil (sa.in ())) - { - sa->update_port_activator (facet_id.in ()); - } - } + port_poa->deactivate_object (facet_id); + } + } this->ccm_remove (); PortableServer::ObjectId_var oid; - this->container_->uninstall_servant ( - this, - Container_Types::COMPONENT_t, - oid.out ()); + cnt_safe->uninstall_servant (this, + Container_Types::COMPONENT_t, + oid.out ()); if (this->home_servant_) { @@ -189,19 +185,25 @@ namespace CIAO retval->length (this->facet_table_.size ()); CORBA::ULong i = 0UL; - for (FacetTable::const_iterator iter = - this->facet_table_.begin (); - iter != this->facet_table_.end (); - ++iter, ++i) - { - ::Components::FacetDescription *fd = 0; - ACE_NEW_THROW_EX (fd, - ::OBV_Components::FacetDescription (iter->first.c_str (), - iter->second->_interface_repository_id (), - iter->second), - CORBA::NO_MEMORY ()); - retval[i] = fd; - } + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + mon, + this->lock_, + CORBA::NO_RESOURCES ()); + for (FacetTable::const_iterator iter = + this->facet_table_.begin (); + iter != this->facet_table_.end (); + ++iter, ++i) + { + ::Components::FacetDescription *fd = 0; + ACE_NEW_THROW_EX (fd, + ::OBV_Components::FacetDescription (iter->first.c_str (), + iter->second->_interface_repository_id (), + iter->second), + CORBA::NO_MEMORY ()); + retval[i] = fd; + } + } return retval._retn (); } @@ -478,7 +480,10 @@ namespace CIAO Connector_Servant_Impl_Base::_default_POA (void) { CIAO_TRACE("Connector_Servant_Impl_Base::_default_POA (void)"); - return container_->the_POA (); + + Container_var cnt_safe = + Container::_duplicate(this->container_.in ()); + return cnt_safe->the_POA (); } ::CORBA::Object_ptr @@ -502,7 +507,9 @@ namespace CIAO } { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + mon, + this->lock_, CORBA::NO_RESOURCES ()); this->facet_table_[port_name] = ::CORBA::Object::_duplicate (port_ref); @@ -539,6 +546,7 @@ namespace CIAO const char * receptacle_name) { CIAO_TRACE ("Connector_Servant_Impl_Base::lookup_receptacle_description"); + ::Components::ReceptacleDescriptions_var all_receptacles = this->get_all_receptacles (); diff --git a/CIAO/ciao/Servants/Extension/README b/CIAO/ciao/Servants/Extension/README new file mode 100644 index 00000000000..04a9ae87a05 --- /dev/null +++ b/CIAO/ciao/Servants/Extension/README @@ -0,0 +1,4 @@ +$Id$ + +CIAO Extension containers are incomplete, experimental and not thread safe. +They may not work as expected. diff --git a/CIAO/ciao/Servants/Extension/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Extension/Servant_Impl_T.cpp index 72a7166d719..263a27417b1 100644 --- a/CIAO/ciao/Servants/Extension/Servant_Impl_T.cpp +++ b/CIAO/ciao/Servants/Extension/Servant_Impl_T.cpp @@ -24,12 +24,12 @@ namespace CIAO ACE_NEW (this->context_, CONTEXT (home, c, this, ins_name)); - ::Components::ExtensionComponent_var scom = + ::Components::ExtensionComponent_var ecom = ::Components::ExtensionComponent::_narrow (exe); - if (! ::CORBA::is_nil (scom.in ())) + if (! ::CORBA::is_nil (ecom.in ())) { - scom->set_extension_context (this->context_); + ecom->set_extension_context (this->context_); } else { @@ -108,10 +108,10 @@ namespace CIAO CORBA::Object_ptr Extension_Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::_get_component (void) { - ::Components::ExtensionContext_var sc = + ::Components::ExtensionContext_var ec = ::Components::ExtensionContext::_narrow (this->context_); - if (! ::CORBA::is_nil (sc.in ())) + if (! ::CORBA::is_nil (ec.in ())) { // @todo return sc->get_CCM_object (); } diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp index 4d9ee76f6ff..cc334924559 100644 --- a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp +++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp @@ -69,15 +69,17 @@ namespace CIAO { CIAO_TRACE ("Home_Servant_Impl<>::remove_component"); - PortableServer::POA_var poa = - this->container_->the_POA (); - PortableServer::ObjectId_var oid = - poa->reference_to_id (comp); + typename CONTAINER::_var_type cnt_safe = + CONTAINER::_duplicate (this->container_.in()); + PortableServer::POA_var poa = cnt_safe->the_POA (); + PortableServer::ObjectId_var oid = poa->reference_to_id (comp); - Components::CCMObject_var ccm_obj_var = Components::CCMObject::_nil (); + Components::CCMObject_var ccm_obj_var; if (objref_map_.find (oid.in (), ccm_obj_var) != 0) { - CIAO_ERROR (1, (LM_WARNING, CLINFO "Home_Servant_Impl<>::remove_component - Invalid component object reference\n")); + CIAO_ERROR (1, (LM_WARNING, CLINFO + "Home_Servant_Impl<>::remove_component - " + "Invalid component object reference\n")); throw Components::RemoveFailure (); } @@ -94,7 +96,9 @@ namespace CIAO _ciao_comp->remove (); } - CIAO_DEBUG (6, (LM_INFO, CLINFO "Home_Servant_Impl<>::remove_component - Removed the component\n")); + CIAO_DEBUG (6, (LM_INFO, CLINFO + "Home_Servant_Impl<>::remove_component - " + "Removed the component\n")); } template <typename BASE_SKEL, @@ -113,8 +117,9 @@ namespace CIAO Components::CCMObject_var ccm_obj_ptr; if (objref_map_.unbind (oid, ccm_obj_ptr) != 0) { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Home_Servant_Impl<>::update_component_map - " - "Invalid component object reference\n")); + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Home_Servant_Impl<>::update_component_map - " + "Invalid component object reference\n")); } } @@ -148,12 +153,16 @@ namespace CIAO if (::CORBA::is_nil (this->executor_.in ())) { - CIAO_ERROR (1, (LM_ERROR, CLINFO "Home_Servant_Impl<>:create - nil executor reference\n")); + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Home_Servant_Impl<>:create - " + "nil executor reference\n")); throw CORBA::INTERNAL (); } - ::Components::EnterpriseComponent_var _ciao_ec = - this->executor_->create (); + typename EXEC::_var_type exec_safe = + EXEC::_duplicate (this->executor_.in()); + + ::Components::EnterpriseComponent_var _ciao_ec = exec_safe->create (); typedef typename COMP_SVNT::_exec_type exec_type; typename COMP_SVNT::_exec_type::_var_type _ciao_comp = @@ -175,7 +184,10 @@ namespace CIAO { CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component"); - CORBA::Object_var hobj = this->container_->get_objref (this); + typename CONTAINER::_var_type cnt_safe = + CONTAINER::_duplicate (this->container_.in()); + + CORBA::Object_var hobj = cnt_safe->get_objref (this); Components::CCMHome_var home = Components::CCMHome::_narrow (hobj.in ()); @@ -194,16 +206,16 @@ namespace CIAO home.in (), (this->ins_name_ + buffer).c_str (), this, - this->container_), + cnt_safe), CORBA::NO_MEMORY ()); PortableServer::ServantBase_var safe (svt); PortableServer::ObjectId_var oid; CORBA::Object_var objref = - this->container_->install_servant (svt, - Container_Types::COMPONENT_t, - oid.out ()); + cnt_safe->install_servant (svt, + Container_Types::COMPONENT_t, + oid.out ()); typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type ho = stub_type::_narrow (objref.in ()); @@ -229,7 +241,10 @@ namespace CIAO { CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component"); - this->container_->uninstall_component (comp); + typename CONTAINER::_var_type cnt_safe = + CONTAINER::_duplicate (this->container_.in()); + + cnt_safe->uninstall_component (comp); } } diff --git a/CIAO/ciao/Servants/Port_Activator.cpp b/CIAO/ciao/Servants/Port_Activator.cpp deleted file mode 100644 index cad8d4d8761..00000000000 --- a/CIAO/ciao/Servants/Port_Activator.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// $Id$ - -#include "Port_Activator.h" - -namespace CIAO -{ - Port_Activator_i::Port_Activator_i (const char *oid, - const char *name, - Port_Activator_Types::Type t) - : oid_ (oid), - name_ (name), - t_ (t) - { - } - - Port_Activator_i::~Port_Activator_i (void) - { - } - - char* - Port_Activator_i::oid (void) - { - return CORBA::string_dup(this->oid_.in ()); - } - - void - Port_Activator_i::oid (const char* oid) - { - this->oid_ = oid; - } - - char* - Port_Activator_i::name (void) - { - return CORBA::string_dup(this->name_.in ()); - } -} diff --git a/CIAO/ciao/Servants/Port_Activator.h b/CIAO/ciao/Servants/Port_Activator.h deleted file mode 100644 index ee8454eb402..00000000000 --- a/CIAO/ciao/Servants/Port_Activator.h +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file Port_Activator.h - * - * $Id$ - * - * @authors Bala Natarajan <bala@dre.vanderbilt.edu> - */ -//============================================================================= - -#ifndef CIAO_PORT_ACTIVATOR_H -#define CIAO_PORT_ACTIVATOR_H - -#include /**/ "ace/pre.h" - -#include "CIAO_Servant_Impl_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/PortableServer.h" -#include "ciao/Servants/CIAO_Port_ActivatorC.h" - -namespace CIAO -{ - /** - * @class Port_Activator_i - * - * @brief Base class for port activations - * - * This is a ABC for the Port_Activator_T <> template class where - * the bulk of the work is done. This class is simply a place holder - * so that we could use the pointer to this class to achieve - * polymorphism for facet and consumer servant activations. - * - */ - class CIAO_Servant_Impl_Export Port_Activator_i : - public virtual Port_Activator - { - public: - Port_Activator_i (const char *oid, - const char *name, - Port_Activator_Types::Type t); - - virtual ~Port_Activator_i (void); - - /// Return the oid of port that this activator encapsulates. - virtual char* oid (void); - - /// Set the oid - virtual void oid (const char* oid); - - /// Return the oid of port that this activator encapsulates. - virtual char* name (void); - - /// Activate the servant responsible for this port. - /** - * There are intentionally no throw specifications. It is the - * caller's responsibility to handle CORBA and C++ - * specifications. - */ - virtual PortableServer::Servant activate ( - const PortableServer::ObjectId &oid) = 0; - - virtual void deactivate (::PortableServer::Servant servant, - CORBA::Boolean remaining_activations) = 0; - - protected: - /// The object ID that is used to activate the servant within the POA. - CORBA::String_var oid_; - - /// Name of the port - CORBA::String_var name_; - - /// What type of port is it, a consumer or facet. - Port_Activator_Types::Type const t_; - }; -} - -#include /**/ "ace/post.h" - -#endif /*CIAO_PORT_ACTIVATOR_H*/ diff --git a/CIAO/ciao/Servants/Port_Activator_T.cpp b/CIAO/ciao/Servants/Port_Activator_T.cpp deleted file mode 100644 index 4aef5bb4a5d..00000000000 --- a/CIAO/ciao/Servants/Port_Activator_T.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// $Id$ - -#ifndef CIAO_PORT_ACTIVATOR_T_CPP -#define CIAO_PORT_ACTIVATOR_T_CPP - -#include "Port_Activator_T.h" -#include "tao/CORBA_String.h" - -#include "ace/OS_NS_string.h" - -namespace CIAO -{ - template <typename SERV, - typename EXEC, - typename CONTEXT, - typename COMP_SERV> - Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::Port_Activator_T ( - const char *oid, - const char *name, - Port_Activator_Types::Type t, - typename EXEC::_ptr_type e, - typename CONTEXT::_ptr_type c, - COMP_SERV *cc) - : Port_Activator_i (oid, name, t) - , executor_ (EXEC::_duplicate (e)) - , context_ (CONTEXT::_duplicate (c)) - , comp_serv_ (cc) - { - } - - template <typename SERV, - typename EXEC, - typename CONTEXT, - typename COMP_SERV> - void - Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::deactivate ( - PortableServer::Servant servant, CORBA::Boolean) - { - SERVANT *s = dynamic_cast<SERVANT *> (servant); - if (s) - { - s->_remove_ref (); - } - } - - template <typename SERV, - typename EXEC, - typename CONTEXT, - typename COMP_SERV> - PortableServer::Servant - Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::activate ( - const PortableServer::ObjectId &oid) - { - CORBA::String_var str = PortableServer::ObjectId_to_string (oid); - - // An additional check, may not be necessary. Being on the safe - // side. - if (ACE_OS::strcmp (this->oid_.in (), str.in ()) == 0) - { - if (this->t_ == Port_Activator_Types::FACET && ::CORBA::is_nil (this->executor_.in ())) - { - ::CORBA::Object_var tmp = - this->comp_serv_->get_facet_executor (this->name_.in ()); - - this->executor_ = EXEC::_narrow (tmp.in ()); - } - - SERVANT *s = 0; - - ACE_NEW_THROW_EX (s, - SERVANT (this->executor_.in (), - this->context_.in ()), - ::CORBA::NO_MEMORY ()); - - return s; - } - - throw ::CORBA::OBJECT_NOT_EXIST (); - } -} - -#endif /*SERVANT_ACTIVATOR_T_CPP*/ diff --git a/CIAO/ciao/Servants/Port_Activator_T.h b/CIAO/ciao/Servants/Port_Activator_T.h deleted file mode 100644 index 3c7bdf0eba8..00000000000 --- a/CIAO/ciao/Servants/Port_Activator_T.h +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Port_Activator_T.h - * - * $Id$ - * - * @authors Bala Natarajan <bala@dre.vanderbilt.edu> - */ -//============================================================================= - -#ifndef CIAO_PORT_ACTIVATOR_T_H -#define CIAO_PORT_ACTIVATOR_T_H -#include /**/ "ace/pre.h" - -#include "ciao/Servants/Port_Activator.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -namespace CIAO -{ - /** - * @class Port_Activator_T - * - * @brief - * Concrete class that implements the strategy for creating - * the right type of servant for the ports in question. - * - * This class is parametrized by the servant type for the port, the - * executor type for the port, the context for the component and the - * component servant which instantiated this class within the - * container. - */ - template <typename SERV, - typename EXEC, - typename CONTEXT, - typename COMP_SERV> - class Port_Activator_T : public virtual Port_Activator_i - { - public: - typedef SERV SERVANT; - - Port_Activator_T (const char *oid, - const char *name, - Port_Activator_Types::Type t, - typename EXEC::_ptr_type e, - typename CONTEXT::_ptr_type c, - COMP_SERV *cs); - - /// Template method from the base class, please see the base class - /// documentation for details. - virtual PortableServer::Servant activate ( - const PortableServer::ObjectId &oid); - - virtual void deactivate ( - PortableServer::Servant servant, CORBA::Boolean remaining_activations); - - private: - /// The executor - typename EXEC::_var_type executor_; - - /// Context classes - typename CONTEXT::_var_type context_; - - /// Component servant which created @c this - COMP_SERV *comp_serv_; - }; -} - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Port_Activator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Port_Activator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" -#endif /*CIAO_SERVANT_ACTIVATOR_T_H*/ diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp index ad9096a23af..a44783626e7 100644 --- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp +++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp @@ -25,6 +25,8 @@ namespace CIAO try { + Container_var cnt_safe = + Container::_duplicate(this->container_.in ()); PortableServer::POA_var port_poa = this->container_->the_port_POA (); @@ -37,14 +39,6 @@ namespace CIAO port_poa->reference_to_id (iter->second); port_poa->deactivate_object (cons_id); - - CIAO::Servant_Activator_var sa = - this->container_->ports_servant_activator (); - - if (!CORBA::is_nil (sa.in ())) - { - sa->update_port_activator (cons_id.in ()); - } } } catch (const CORBA::Exception& ex) @@ -275,7 +269,9 @@ namespace CIAO } { - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, + mon, + this->lock_, CORBA::NO_RESOURCES ()); this->consumer_table_[port_name] = ::Components::EventConsumerBase::_duplicate (port_ref); diff --git a/CIAO/ciao/Servants/Servants.mpc b/CIAO/ciao/Servants/Servants.mpc index 98072f55d0a..886ba5da90b 100644 --- a/CIAO/ciao/Servants/Servants.mpc +++ b/CIAO/ciao/Servants/Servants.mpc @@ -1,36 +1,6 @@ // $Id$ -project(CIAO_Port_Activator_stub_idl) : install, ciaoidldefaults { - custom_only = 1 - idlflags += -Wb,stub_export_include=CIAO_Port_Activator_export.h \ - -Wb,stub_export_macro=CIAO_PORT_ACTIVATOR_Export \ - -SS -Sci -Gxhst - IDL_Files { - CIAO_Port_Activator.idl - } - - specific { - install_dir = ciao/Servants - } -} - -project(CIAO_Port_Activator_stub) : install, portableserver, ciao_lib { - dynamicflags += CIAO_PORT_ACTIVATOR_BUILD_DLL - after += CIAO_Port_Activator_stub_idl - IDL_Files { - } - Source_Files { - CIAO_Port_ActivatorC.cpp - } - Header_Files { - CIAO_Port_ActivatorC.h - CIAO_Port_ActivatorS.h - } - specific { - install_dir = ciao/Servants - } -} -project(CIAO_Servant_Impl) : install, ciao_servant_activator_stub, ciao_port_activator_stub, ciao_container_base_stub, ccm_svnt, ccm_session_stub, ciao_output, ciao_logger { +project(CIAO_Servant_Impl) : install, ciao_container_base_stub, ccm_svnt, ccm_session_stub, ciao_output, ciao_logger, ccm_direct_collocation { dynamicflags += CIAO_SERVANT_IMPL_BUILD_DLL IDL_Files { } @@ -40,14 +10,12 @@ project(CIAO_Servant_Impl) : install, ciao_servant_activator_stub, ciao_port_act Home_Servant_Impl_Base.cpp Servant_Impl_Base.cpp StandardConfigurator_Impl.cpp - Port_Activator.cpp } Template_Files { Home_Servant_Impl_T.cpp Connector_Servant_Impl_Utils_T.cpp Servant_Impl_Utils_T.cpp - Port_Activator_T.cpp } Header_Files { @@ -57,9 +25,6 @@ project(CIAO_Servant_Impl) : install, ciao_servant_activator_stub, ciao_port_act Home_Servant_Impl_T.h Servant_Impl_Base.h StandardConfigurator_Impl.h - Port_Activator.h - Port_Activator_T.h - CIAO_Port_Activator_export.h } specific { diff --git a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp index 3b78d1d6680..32066508613 100644 --- a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp +++ b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp @@ -46,6 +46,7 @@ namespace CIAO typename CONTEXT> Session_Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::~Session_Servant_Impl (void) { + //TODO: thread safe? How? if (this->executor_->_refcount_value () > 1) { CIAO_ERROR (1, diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h index 6a55e19509b..cab14dfcc8a 100644 --- a/CIAO/ciao/Version.h +++ b/CIAO/ciao/Version.h @@ -5,5 +5,5 @@ #define CIAO_MAJOR_VERSION 1 #define CIAO_MINOR_VERSION 0 -#define CIAO_BETA_VERSION 4 -#define CIAO_VERSION "1.0.4" +#define CIAO_BETA_VERSION 5 +#define CIAO_VERSION "1.0.5" diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt b/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt index 9391e7e8e3a..f4f0ed07ee8 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt @@ -1,4 +1,4 @@ -// $Id$ +$Id$ This test exists of 3 components. -Master component which sends asynchronous and synchronous calls to a Sender. diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml index e277238f544..53e0d484a6c 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml index b07c595d99e..402942fa59b 100644 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/models/README b/CIAO/connectors/dds4ccm/examples/Shapes/models/README index 454b073b90c..5afacc4a2f9 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/models/README +++ b/CIAO/connectors/dds4ccm/examples/Shapes/models/README @@ -1,4 +1,4 @@ -README +$Id$ The follow steps is how you import IDL input PICML for the Shapes example so that the IDL generator works properly. @@ -8,12 +8,12 @@ example so that the IDL generator works properly. Please notice the -l command-line option, which is something new to idl_to_picml. If you type --help, the -l option will be listed. -What this will do is not only import the IDL in the Shapes directory, -but also attach the dds4ccm.xme file as a GME library to the Shapes -example. Furthermore, it will search the attached library to resolve -any references that it cannot find based on parsing IDL files located +What this will do is not only import the IDL in the Shapes directory, +but also attach the dds4ccm.xme file as a GME library to the Shapes +example. Furthermore, it will search the attached library to resolve +any references that it cannot find based on parsing IDL files located in the Shapes subdirectories (or the one specified at the command-line). -After doing this, you should be able to import the Shapes example +After doing this, you should be able to import the Shapes example and generate the IDL files, which there original location retained, -which is also something new to idl_to_picml and the IDL generator. ;-) +which is also something new to idl_to_picml and the IDL generator. ;-) diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc index 130ab10f97a..c915f486cfe 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc @@ -21,9 +21,15 @@ project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults { dds4ccm_StateListenerControlE.idl dds4ccm_ConnectorE.idl } + + specific { + install_dir = connectors/dds4ccm/idl + } } -project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client { +project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ccm_session_stub, \ + ciaolib_with_idl, ciao_output, taolib, valuetype, \ + ifr_client { after += DDS4CCM_stub DDS4CCM_lem_gen CIAO_NDDS_lem_stub libs += DDS4CCM_stub includes += $(CIAO_ROOT)/connectors @@ -50,7 +56,22 @@ project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ccm_session_stub, c dds4ccm_DataListenerControlEC.h dds4ccm_ConnectorStatusListenerEC.h dds4ccm_StateListenerControlEC.h + dds4ccm_ConnectorEC.h dds4ccm_lem_stub_export.h } + + Inline_Files { + dds4ccm_BaseEC.inl + dds_rtf2_dcpsEC.inl + dds4ccm_PortStatusListenerEC.inl + dds4ccm_DataListenerControlEC.inl + dds4ccm_ConnectorStatusListenerEC.inl + dds4ccm_StateListenerControlEC.inl + dds4ccm_ConnectorEC.inl + } + + specific { + install_dir = connectors/dds4ccm/idl + } } diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc index 5ce6f26cf24..309ba352d67 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc @@ -1,6 +1,7 @@ // $Id$ -project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { +project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, \ + ciao_output, taolib, portableserver, ciao_servant { includes += $(CIAO_ROOT)/connectors dynamicflags += DDS4CCM_SKEL_BUILD_DLL @@ -8,12 +9,16 @@ project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, ciao_outpu } Header_Files { + dds4ccm_skel_export.h + dds4ccm_EntityS.h + ccm_ddsS.h dds4ccm_BaseS.h dds4ccm_QueryFilterS.h dds4ccm_PortStatusListenerS.h dds4ccm_DataListenerControlS.h dds4ccm_StateListenerControlS.h dds4ccm_ConnectorStatusListenerS.h + dds4ccm_ConnectorS.h dds_rtf2_dcpsS.h } @@ -25,4 +30,17 @@ project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, ciao_outpu dds4ccm_ConnectorS.cpp dds4ccm_StateListenerControlS.cpp } + + Inline_Files { + dds_rtf2_dcpsS.inl + dds4ccm_PortStatusListenerS.inl + dds4ccm_DataListenerControlS.inl + dds4ccm_ConnectorStatusListenerS.inl + dds4ccm_ConnectorS.inl + dds4ccm_StateListenerControlS.inl + } + + specific { + install_dir = connectors/dds4ccm/idl + } } diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc index fe189aa6d4e..9d1abfae6ff 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc @@ -9,19 +9,20 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { -I$(CIAO_ROOT)/connectors -Glem IDL_Files { + idlflags -= -Gsv idlflags += -Gxhst -Gxhsk -SS dds4ccm_Base.idl } IDL_Files { - idlflags -= -Gxhst -Gxhsk + idlflags -= -Gxhst -Gxhsk -Gsv -Glem idlflags -= -St -Sa idlflags += -SS dds4ccm_QueryFilter.idl } IDL_Files { - idlflags -= -Gxhst -Gxhsk + idlflags -= -Gxhst -Gxhsk -Gsv idlflags += -Sci -SS -Scc dds4ccm_Entity.idl ccm_dds.idl @@ -36,6 +37,10 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { dds4ccm_StateListenerControl.idl dds4ccm_Connector.idl } + + specific { + install_dir = connectors/dds4ccm/idl + } } project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib { @@ -47,12 +52,16 @@ project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_outp } Header_Files { + dds4ccm_stub_export.h + dds4ccm_EntityC.h + ccm_ddsC.h dds4ccm_BaseC.h dds4ccm_QueryFilterC.h dds4ccm_PortStatusListenerC.h dds4ccm_DataListenerControlC.h dds4ccm_ConnectorStatusListenerC.h dds4ccm_StateListenerControlC.h + dds4ccm_ConnectorC.h dds_rtf2_dcpsC.h } @@ -66,5 +75,19 @@ project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_outp dds4ccm_ConnectorC.cpp dds_rtf2_dcpsC.cpp } + + Inline_Files { + dds4ccm_BaseC.inl + dds4ccm_PortStatusListenerC.inl + dds4ccm_DataListenerControlC.inl + dds4ccm_ConnectorStatusListenerC.inl + dds4ccm_StateListenerControlC.inl + dds4ccm_ConnectorC.inl + dds_rtf2_dcpsC.inl + } + + specific { + install_dir = connectors/dds4ccm/idl + } } diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl index 76829440c2a..573ca744dae 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl @@ -229,8 +229,8 @@ module DDS { local interface Listener {}; local interface TopicListener : Listener { - void on_inconsistent_topic(in Topic the_topic, - in InconsistentTopicStatus status); + void on_inconsistent_topic(in Topic the_topic, + in InconsistentTopicStatus status); }; local interface DataWriterListener : Listener { diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc index 1a0dc70497c..ff39d52a23f 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc @@ -15,6 +15,10 @@ project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults { IDL_Files { ndds_dcps_i_handleE.idl } + + specific { + install_dir = connectors/dds4ccm/idl/ndds + } } project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client { @@ -35,5 +39,14 @@ project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_se ndds_lem_stub_export.h ndds_dcps_i_handleEC.h } + + Inline_Files { + ndds_dcpsEC.inl + ndds_dcps_i_handleEC.inl + } + + specific { + install_dir = connectors/dds4ccm/idl/ndds + } } diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc index 3ac0258877a..8a3c01e4d7f 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc @@ -9,6 +9,7 @@ project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_o } Header_Files { + ndds_skel_export.h ndds_dcpsS.h ndds_dcps_i_handleS.h } @@ -17,4 +18,13 @@ project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_o ndds_dcpsS.cpp ndds_dcps_i_handleS.cpp } + + Inline_Files { + ndds_dcpsS.inl + ndds_dcps_i_handleS.inl + } + + specific { + install_dir = connectors/dds4ccm/idl/ndds + } } diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc index c57e5e28376..bb24ef53099 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc @@ -9,12 +9,18 @@ project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults { -I$(CIAO_ROOT)/connectors -Glem IDL_Files { + idlflags -= -Gsv ndds_dcps.idl } + IDL_Files { - idlflags -= -Gxhst -Gxhsk + idlflags -= -Gxhst -Gxhsk -Gsv ndds_dcps_i_handle.idl } + + specific { + install_dir = connectors/dds4ccm/idl/ndds + } } project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, ciao_output, taolib { @@ -27,6 +33,7 @@ project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, c } Header_Files { + ndds_stub_export.h ndds_dcpsC.h ndds_dcps_i_handleC.h ndds_dcps_instance_handleC.h @@ -37,6 +44,21 @@ project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, c ndds_dcps_i_handleC.cpp ndds_dcps_instance_handleC.cpp } + + Inline_Files { + ndds_dcpsC.inl + ndds_dcps_i_handleC.inl + } + + specific { + install_dir = connectors/dds4ccm/idl/ndds + } + + verbatim(gnuace, postinstall) { +" cp ndds_dcps_instance_handle.idl $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/" +" cp ndds_dcps_instance_handle*.h $(INSTALL_PREFIX)/include/connectors/dds4ccm/idl/ndds/" + } + } project (CIAO_NDDS_idl_install_only) { diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp index ea7741dcc66..b60a111538e 100644 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp +++ b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp @@ -43,7 +43,9 @@ CIAO::DDS4CCM::CCM_DataReader::create_readcondition ( ::DDS::ViewStateMask view_states, ::DDS::InstanceStateMask instance_states) { - return this->dds_entity ()->create_readcondition (sample_states, view_states, instance_states); + return this->dds_entity ()->create_readcondition (sample_states, + view_states, + instance_states); } ::DDS::QueryCondition_ptr @@ -54,7 +56,11 @@ CIAO::DDS4CCM::CCM_DataReader::create_querycondition ( const char * query_expression, const ::DDS::StringSeq & query_parameters) { - return this->dds_entity ()->create_querycondition (sample_states, view_states, instance_states, query_expression, query_parameters); + return this->dds_entity ()->create_querycondition (sample_states, + view_states, + instance_states, + query_expression, + query_parameters); } ::DDS::ReturnCode_t @@ -171,7 +177,8 @@ CIAO::DDS4CCM::CCM_DataReader::get_matched_publication_data ( ::DDS::PublicationBuiltinTopicData & publication_data, DDS_INSTANCE_HANDLE_T_IN publication_handle) { - return this->dds_entity ()->get_matched_publication_data (publication_data, publication_handle); + return this->dds_entity ()->get_matched_publication_data (publication_data, + publication_handle); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp index 3786f19ca7c..1371b7e41c1 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp @@ -35,6 +35,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_data (v this->supplier_obtained_ = true; this->supplier_.set_component (this); + this->init_publisher_ |= this->supplier_obtained_; return this->supplier_.get_data (); } @@ -46,6 +47,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_dds_ent this->supplier_obtained_ = true; this->supplier_.set_component (this); + this->init_publisher_ |= this->supplier_obtained_; return this->supplier_.get_dds_entity (); } @@ -57,6 +59,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fr this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); + this->init_subscriber_ |= this->pull_consumer_obtained_; return this->pull_consumer_.get_fresh_data (); } @@ -68,6 +71,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_da this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); + this->init_subscriber_ |= this->push_consumer_obtained_; return this->push_consumer_.get_data (); } @@ -79,6 +83,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_da this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); + this->init_subscriber_ |= this->pull_consumer_obtained_; return this->pull_consumer_.get_data (); } @@ -90,6 +95,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fi this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); + this->init_subscriber_ |= this->pull_consumer_obtained_; return this->pull_consumer_.get_filter_config (); } @@ -101,6 +107,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_da this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); + this->init_subscriber_ |= this->push_consumer_obtained_; return this->push_consumer_.get_data_control (); } @@ -112,6 +119,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_dd this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); + this->init_subscriber_ |= this->pull_consumer_obtained_; return this->pull_consumer_.get_dds_entity (); } @@ -142,6 +150,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_dd this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); + this->init_subscriber_ |= this->push_consumer_obtained_; return this->push_consumer_.get_dds_entity (); } @@ -153,6 +162,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_fi this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); + this->init_subscriber_ |= this->push_consumer_obtained_; return this->push_consumer_.get_filter_config (); } @@ -182,7 +192,46 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name ( { DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name"); - if (this->late_binded (topic_name)) + if (this->stop_dds (topic_name)) + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_Event_Connector_T::topic_name - " + "Stopping DDS=>switching to new topic <%C>.\n", + topic_name)); + this->ccm_passivate (); + this->do_ccm_remove (); + + if (ACE_OS::strlen (topic_name) > 0) + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_Event_Connector_T::topic_name - " + "DDS is down. Setting new to <%C>.\n", + topic_name)); + + TopicBaseConnector::topic_name (topic_name); + + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_Event_Connector_T::topic_name - " + "Initialize DDS again for topic <%C>.\n", + topic_name)); + + this->do_configuration_complete (); + this->do_ccm_activate (); + + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_Event_Connector_T::topic_name - " + "DDS up and running for topic <%C>.\n", + topic_name)); + } + else + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_Event_Connector_T::topic_name - " + "DDS is down.\n")); + TopicBaseConnector::topic_name (topic_name); + } + } + else if (this->late_binded (topic_name)) { this->do_configuration_complete (); this->do_ccm_activate (); @@ -204,21 +253,24 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_com { DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete"); - TopicBaseConnector::configuration_complete (); + typename CCM_TYPE::push_consumer_traits::data_listener_type::_var_type + push_consumer_data_listener = + this->context_->get_connection_push_consumer_data_listener (); - typename CCM_TYPE::push_consumer_traits::data_listener_type::_var_type push_consumer_data_listener = - this->context_->get_connection_push_consumer_data_listener (); this->push_consumer_obtained_ |= ! ::CORBA::is_nil (push_consumer_data_listener.in ()); - ::CCM_DDS::PortStatusListener_var push_consumer_psl = this->context_->get_connection_push_consumer_status (); this->push_consumer_obtained_ |= ! ::CORBA::is_nil (push_consumer_psl.in ()); + this->init_subscriber_ |= this->push_consumer_obtained_; ::CCM_DDS::PortStatusListener_var pull_consumer_psl = this->context_->get_connection_pull_consumer_status (); this->pull_consumer_obtained_ |= ! ::CORBA::is_nil (pull_consumer_psl.in ()); + this->init_subscriber_ |= this->pull_consumer_obtained_; + + TopicBaseConnector::configuration_complete (); if (this->push_consumer_obtained_) { @@ -443,12 +495,12 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) } } + template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); - + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove"); try { if (ACE_OS::strlen (this->topic_name_) != 0) @@ -475,7 +527,7 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) DDS4CCM_PRINT_INTERNAL_EXCEPTION ( DDS4CCM_LOG_LEVEL_ERROR, ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_Event_Connector_T::ccm_remove"); + "DDS_Event_Connector_T::do_ccm_remove"); throw ::CORBA::INTERNAL (); } catch (const ::CORBA::Exception& ex) @@ -483,14 +535,37 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) DDS4CCM_PRINT_CORBA_EXCEPTION ( DDS4CCM_LOG_LEVEL_ERROR, ex, - "DDS_Event_Connector_T::ccm_remove"); + "DDS_Event_Connector_T::do_ccm_remove"); throw; } catch (...) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Event_Connector_T::ccm_remove - " + "DDS_Event_Connector_T::do_ccm_remove - " "Caught unexpected exception.\n")); throw ::CORBA::INTERNAL (); } } + +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +void +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); + if (this->push_consumer_obtained_) + { + this->push_consumer_.set_component (::CORBA::Object::_nil ()); + } + + if (this->supplier_obtained_) + { + this->supplier_.set_component (::CORBA::Object::_nil ()); + } + + if (this->pull_consumer_obtained_) + { + this->pull_consumer_.set_component (::CORBA::Object::_nil ()); + } + + this->do_ccm_remove (); +} diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h index 53436c30d26..d4ee38981ac 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h @@ -123,6 +123,7 @@ private: void do_configuration_complete (void); void do_ccm_activate (void); + void do_ccm_remove (void); typedef DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> TopicBaseConnector; }; diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp index 30fe30dd841..3837ed218ec 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp @@ -45,7 +45,6 @@ DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::remove { DDS4CCM_TRACE ("DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::remove"); SubscriberBase_type::remove (subscriber); - this->dds_get_->_set_component (::CORBA::Object::_nil ()); } template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE, bool FIXED> diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h index 7b670374730..5ec5598f196 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h @@ -35,8 +35,7 @@ public: ::DDS::Subscriber_ptr subscriber, const char * qos_profile); - void remove ( - ::DDS::Subscriber_ptr subscriber); + void remove (::DDS::Subscriber_ptr subscriber); private: typedef DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp index d6b6fb93c6f..d96d926e7a3 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp @@ -81,8 +81,6 @@ DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove ( { DDS4CCM_TRACE ("DDS_Listen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove"); - this->data_control_->_set_component (::CORBA::Object::_nil ()); - SubscriberBase_type::remove (subscriber); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp index 3f617c44643..62eb3c5db87 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp @@ -82,7 +82,6 @@ DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::remov { DDS4CCM_TRACE ("DDS_StateListen_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove"); - this->data_control_->_set_component (::CORBA::Object::_nil ()); SubscriberBase_type::remove (subscriber); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp index 7869391559c..ee278dd36fd 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp @@ -34,6 +34,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_data this->observable_obtained_ = true; this->observable_.set_component (this); + this->init_publisher_ |= this->observable_obtained_; return this->observable_.get_data (); } @@ -45,6 +46,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_dds_e this->observable_obtained_ = true; this->observable_.set_component (this); + this->init_publisher_ |= this->observable_obtained_; return this->observable_.get_dds_entity (); } @@ -56,6 +58,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); + this->init_subscriber_ |= this->passive_observer_obtained_; return this->passive_observer_.get_data (); } @@ -67,6 +70,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); + this->init_subscriber_ |= this->passive_observer_obtained_; return this->passive_observer_.get_dds_entity (); } @@ -78,6 +82,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); + this->init_subscriber_ |= this->passive_observer_obtained_; return this->passive_observer_.get_filter_config (); } @@ -108,6 +113,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_da this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); + this->init_subscriber_ |= this->pull_observer_obtained_; return this->pull_observer_.get_data (); } @@ -119,6 +125,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fr this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); + this->init_subscriber_ |= this->pull_observer_obtained_; return this->pull_observer_.get_fresh_data (); } @@ -130,6 +137,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_dd this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); + this->init_subscriber_ |= this->pull_observer_obtained_; return this->pull_observer_.get_dds_entity (); } @@ -141,6 +149,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fi this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); + this->init_subscriber_ |= this->pull_observer_obtained_; return this->pull_observer_.get_filter_config (); } @@ -171,6 +180,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_da this->push_observer_obtained_ = true; this->push_observer_.set_component (this); + this->init_subscriber_ |= this->push_observer_obtained_; return this->push_observer_.get_data (); } @@ -182,6 +192,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_da this->push_observer_obtained_ = true; this->push_observer_.set_component (this); + this->init_subscriber_ |= this->push_observer_obtained_; return this->push_observer_.get_data_control (); } @@ -193,6 +204,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_dd this->push_observer_obtained_ = true; this->push_observer_.set_component (this); + this->init_subscriber_ |= this->push_observer_obtained_; return this->push_observer_.get_dds_entity (); } @@ -204,6 +216,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_fi this->push_observer_obtained_ = true; this->push_observer_.set_component (this); + this->init_subscriber_ |= this->push_observer_obtained_; return this->push_observer_.get_filter_config (); } @@ -234,6 +247,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_obser this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); + this->init_subscriber_ |= this->push_state_observer_obtained_; return this->push_state_observer_.get_data (); } @@ -245,6 +259,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_obser this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); + this->init_subscriber_ |= this->push_state_observer_obtained_; return this->push_state_observer_.get_data_control (); } @@ -256,6 +271,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_obser this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); + this->init_subscriber_ |= this->push_state_observer_obtained_; return this->push_state_observer_.get_dds_entity (); } @@ -267,6 +283,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_obser this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); + this->init_subscriber_ |= this->push_state_observer_obtained_; return this->push_state_observer_.get_filter_config (); } @@ -296,7 +313,45 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name ( { DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name"); - if (this->late_binded (topic_name)) + if (this->stop_dds (topic_name)) + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_State_Connector_T::topic_name - " + "Stopping DDS=>switching to new topic <%C>.\n", + topic_name)); + this->ccm_passivate (); + this->do_ccm_remove (); + + if (ACE_OS::strlen (topic_name) > 0) + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_State_Connector_T::topic_name - " + "DDS is down. Setting new to <%C>.\n", + topic_name)); + + TopicBaseConnector::topic_name (topic_name); + + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_State_Connector_T::topic_name - " + "Initialize DDS again for topic <%C>.\n", + topic_name)); + + this->do_configuration_complete (); + this->do_ccm_activate (); + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_State_Connector_T::topic_name - " + "DDS up and running for topic <%C>.\n", + topic_name)); + } + else + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_Event_Connector_T::topic_name - " + "DDS is down.\n")); + TopicBaseConnector::topic_name (topic_name); + } + } + else if (this->late_binded (topic_name)) { this->do_configuration_complete (); this->do_ccm_activate (); @@ -318,14 +373,13 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_com { DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete"); - TopicBaseConnector::configuration_complete (); - ::CCM_DDS::PortStatusListener_var push_observer_psl = this->context_->get_connection_push_observer_status (); typename CCM_TYPE::push_observer_traits::data_listener_type::_var_type push_observer_dl = this->context_->get_connection_push_observer_data_listener (); this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_psl.in ()); this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_dl.in ()); + this->init_subscriber_ |= this->push_observer_obtained_; ::CCM_DDS::PortStatusListener_var push_state_observer_psl = this->context_->get_connection_push_state_observer_status (); @@ -333,14 +387,19 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_com this->context_->get_connection_push_state_observer_data_listener (); this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_psl.in ()); this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_dl.in ()); + this->init_subscriber_ |= this->push_state_observer_obtained_; ::CCM_DDS::PortStatusListener_var pull_observer_psl = this->context_->get_connection_pull_observer_status (); this->pull_observer_obtained_ |= ! ::CORBA::is_nil (pull_observer_psl.in ()); + this->init_subscriber_ |= this->pull_observer_obtained_; ::CCM_DDS::PortStatusListener_var passive_observer_psl = this->context_->get_connection_passive_observer_status (); this->passive_observer_obtained_ |= ! ::CORBA::is_nil (passive_observer_psl.in ()); + this->init_subscriber_ |= this->passive_observer_obtained_; + + TopicBaseConnector::configuration_complete (); if (this->observable_obtained_) { @@ -587,10 +646,9 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); - + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_remove"); try { if (ACE_OS::strlen (this->topic_name_) != 0) @@ -627,7 +685,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) DDS4CCM_PRINT_INTERNAL_EXCEPTION ( DDS4CCM_LOG_LEVEL_ERROR, ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - "DDS_State_Connector_T::ccm_remove"); + "DDS_State_Connector_T::do_ccm_remove"); throw ::CORBA::INTERNAL (); } catch (const ::CORBA::Exception& ex) @@ -635,15 +693,49 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) DDS4CCM_PRINT_CORBA_EXCEPTION ( DDS4CCM_LOG_LEVEL_ERROR, ex, - "DDS_State_Connector_T::ccm_remove"); + "DDS_State_Connector_T::do_ccm_remove"); throw; } catch (...) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_State_Connector_T::ccm_remove - " + "DDS_State_Connector_T::do_ccm_remove - " "Caught unexpected exception.\n")); throw ::CORBA::INTERNAL (); } } +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +void +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) +{ + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); + + if (this->observable_obtained_) + { + this->observable_.set_component (::CORBA::Object::_nil ()); + } + + if (this->push_observer_obtained_) + { + this->push_observer_.set_component (::CORBA::Object::_nil ()); + } + + if (this->push_state_observer_obtained_) + { + this->push_state_observer_.set_component (::CORBA::Object::_nil ()); + } + + if (this->pull_observer_obtained_) + { + this->pull_observer_.set_component (::CORBA::Object::_nil ()); + } + + if (this->passive_observer_obtained_) + { + this->passive_observer_.set_component (::CORBA::Object::_nil ()); + } + + this->do_ccm_remove (); +} + diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h index c67badb0454..b27b8f2887d 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h @@ -199,6 +199,7 @@ private: void do_configuration_complete (void); void do_ccm_activate (void); + void do_ccm_remove (void); typedef DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> TopicBaseConnector; }; diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index cd08bf48d8b..3d95f4f60bc 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -208,7 +208,6 @@ DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::r } } this->cft_setting_->delete_contentfilteredtopic (subscriber); - this->dds_read_->_set_component (::CORBA::Object::_nil ()); this->dds_read_->set_dds_reader (::DDS::DataReader::_nil (), 0); this->condition_manager_.set_dds_entity (::DDS::DataReader::_nil ()); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp index d4cac2fb147..27f575acf07 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp @@ -7,6 +7,8 @@ template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE> DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::DDS_TopicBase_Connector_T (void) : BaseConnector () + , init_subscriber_ (false) + , init_publisher_(false) , late_binding_ (false) { } @@ -32,6 +34,27 @@ DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binding (bool late this->late_binding_ |= late_binding; } + +template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE> +bool +DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::stop_dds ( + const char * topic_name) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::stop_dds"); + + if (!::CORBA::is_nil (this->topic_name_.in ())) + { //topic name already set + // do not stop DDS when topic names are equal + if (ACE_OS::strlen (this->topic_name_.in ()) == 0) + return false; + return ACE_OS::strcmp (this->topic_name_.in (), topic_name) != 0; + } + else + { //topic is not set + return false; + } +} + template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE> bool DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binded ( @@ -41,27 +64,23 @@ DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::late_binded ( this->late_binding (ACE_OS::strlen (topic_name) == 0); - if (this->late_binding () && - ACE_OS::strlen (topic_name) > 0 && + if (ACE_OS::strlen (topic_name) > 0 && + !CORBA::is_nil (this->topic_name_) && ACE_OS::strlen (this->topic_name_.in ()) == 0) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO ACE_TEXT ("DDS_TopicBase_Connector_T::late_binded - ") - ACE_TEXT ("Topic %C is late binded.\n"), topic_name)); + ACE_TEXT ("Topic <%C> is late binded.\n"), topic_name)); DDS_TopicBase_Connector_T::topic_name (topic_name); return true; } - else if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else + else if (!this->configuration_complete_) { - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - ACE_TEXT ("DDS_TopicBase_Connector_T::late_binded - ") - ACE_TEXT ("Topic %C is not late binded.\n"), topic_name)); DDS_TopicBase_Connector_T::topic_name (topic_name); } + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + ACE_TEXT ("DDS_TopicBase_Connector_T::late_binded - ") + ACE_TEXT ("Topic <%C> is not late binded.\n"), topic_name)); return false; } @@ -80,19 +99,45 @@ DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::configuration_complete typesupport_name = type.get_type_name (); #endif + ::CCM_DDS::ConnectorStatusListener_var error_listener = + this->context_->get_connection_error_listener (); + this->init_subscriber_ |= ! ::CORBA::is_nil (error_listener.in ()); + this->init_publisher_ |= ! ::CORBA::is_nil (error_listener.in ()); + if (::CORBA::is_nil (this->topic_.in ())) { this->register_type (this->domain_participant_.in (), typesupport_name); + this->init_topic (this->domain_participant_.in (), this->topic_.inout () , this->topic_name_.in (), typesupport_name.in ()); } - this->init_subscriber (this->domain_participant_.in (), - this->subscriber_.inout ()); - this->init_publisher (this->domain_participant_.in (), - this->publisher_.inout ()); + + if (this->init_subscriber_) + { + this->init_subscriber (this->domain_participant_.in (), + this->subscriber_.inout ()); + } + else + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_TopicBase_Connector_T::configuration_complete - " + "No need to create a subscriber.\n")); + } + + if (this->init_publisher_) + { + this->init_publisher (this->domain_participant_.in (), + this->publisher_.inout ()); + } + else + { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO + "DDS_TopicBase_Connector_T::configuration_complete - " + "No need to create a publisher.\n")); + } } template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE> @@ -106,12 +151,18 @@ DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_activate (void) this->activate_topic (reactor, this->topic_.in (), this->topiclistener_.inout ()); - this->activate_subscriber (reactor, - this->subscriber_.in (), - this->subscriber_listener_.inout ()); - this->activate_publisher (reactor, - this->publisher_.in (), - this->publisher_listener_.inout ()); + if (this->init_subscriber_) + { + this->activate_subscriber (reactor, + this->subscriber_.in (), + this->subscriber_listener_.inout ()); + } + if (this->init_publisher_) + { + this->activate_publisher (reactor, + this->publisher_.in (), + this->publisher_listener_.inout ()); + } } template <typename CCM_TYPE, typename DDS_TYPE, typename SEQ_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h index a42b39d00a3..61900d21086 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h @@ -43,6 +43,7 @@ protected: bool late_binding (void); void late_binding (bool late_binding); bool late_binded (const char * topic_name); + bool stop_dds (const char * topic_name); CORBA::String_var topic_name_; DDS::StringSeq key_fields_; @@ -55,6 +56,9 @@ protected: ::DDS::Subscriber_var subscriber_; ::DDS::SubscriberListener_var subscriber_listener_; + bool init_subscriber_; + bool init_publisher_; + typedef DDS_Base_Connector_T<CCM_TYPE> BaseConnector; #if (CIAO_DDS4CCM_NDDS==1) diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp index 87e38a86c9b..3277146a1bd 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp @@ -126,7 +126,6 @@ DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove ( ::CIAO::DDS4CCM::translate_retcode (retval))); throw ::CORBA::INTERNAL (); } - this->dds_update_->_set_component (::CORBA::Object::_nil ()); this->dds_update_->set_dds_writer (::DDS::DataWriter::_nil ()); this->ccm_data_writer_->set_dds_entity (::DDS::DataWriter::_nil ()); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp index 5f6ab877bf6..c892fffe610 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp @@ -89,6 +89,7 @@ DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_c this->ccm_data_writer_->set_dds_entity (dwv_tmp.in ()); } } + template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE> void DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::activate () @@ -118,7 +119,6 @@ DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::remove ( if (retcode == ::DDS::RETCODE_OK) { - this->dds_write_->_set_component (::CORBA::Object::_nil ()); this->dds_write_->set_dds_writer (::DDS::DataWriter::_nil ()); this->ccm_data_writer_->set_dds_entity (::DDS::DataWriter::_nil ()); } diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp index e2e9a77b862..13e5d5bda95 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp @@ -295,7 +295,7 @@ namespace CIAO } // Check which conditions have triggered the wait method to 'wake up'. - for (::CORBA::ULong i = 0; i < active_conditions.length(); i++) + for (::CORBA::ULong i = 0; i < active_conditions.length(); ++i) { // Check whether this condition is the one we were waiting for. if (this->condition_manager_->check_condition (active_conditions[i].in ())) @@ -398,7 +398,7 @@ namespace CIAO ::DDS::SampleInfoSeq sample_info; SEQ_VALUE_TYPE data; // Check which conditions have triggered the wait method to 'wake up'. - for (::CORBA::ULong i = 0; i < active_conditions.length(); i++) + for (::CORBA::ULong i = 0; i < active_conditions.length(); ++i) { // Check whether this condition is the one we were waiting for. if (this->condition_manager_->check_condition (active_conditions[i].in ())) diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp index 7594a282110..04141dc73ed 100644 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp @@ -28,6 +28,8 @@ namespace CIAO const VALUE_TYPE& an_instance, DDS_INSTANCE_HANDLE_T_IN instance_handle) { + DDS4CCM_TRACE ("Reader_T::check_handle"); + ::DDS::InstanceHandle_t const lookup_hnd = this->dds_reader ()->lookup_instance (an_instance); @@ -41,6 +43,8 @@ namespace CIAO const ::DDS::SampleInfoSeq& sample_infos, const bool determine_last) { + DDS4CCM_TRACE ("Reader_T::get_nr_valid_samples"); + CORBA::ULong nr_of_samples = 0; if (determine_last) { @@ -74,6 +78,8 @@ namespace CIAO ::CCM_DDS::ReadInfoSeq& infos, const ::DDS::SampleInfoSeq & sample_info) { + DDS4CCM_TRACE ("Reader_T::convert_data"); + CORBA::ULong samples_to_return = this->get_nr_valid_samples (sample_info, false); infos.length (samples_to_return); @@ -133,6 +139,7 @@ namespace CIAO ::DDS::QueryCondition_ptr qc) { DDS4CCM_TRACE ("Reader_T::read_wo_instance"); + ::DDS::ReturnCode_t retval = ::DDS::RETCODE_ERROR; if (! ::CORBA::is_nil (qc)) @@ -174,6 +181,8 @@ namespace CIAO ::DDS::SampleInfoSeq sample_info, bool throw_exception) { + DDS4CCM_TRACE ("Reader_T::return_loan"); + // Return the loan ::DDS::ReturnCode_t const retval = this->dds_reader ()->return_loan (data, sample_info); @@ -196,6 +205,8 @@ namespace CIAO SEQ_VALUE_TYPE& instances, ::CCM_DDS::ReadInfoSeq& infos) { + DDS4CCM_TRACE ("Reader_T::read_last"); + // This function has to return the last sample of all instances ::DDS::SampleInfoSeq sample_info; SEQ_VALUE_TYPE data; @@ -229,6 +240,8 @@ namespace CIAO SEQ_VALUE_TYPE& instances, ::CCM_DDS::ReadInfoSeq& infos) { + DDS4CCM_TRACE ("Reader_T::read_all"); + // This function has to return all samples of all instances ::DDS::SampleInfoSeq sample_info; SEQ_VALUE_TYPE data; @@ -249,6 +262,8 @@ namespace CIAO ::CCM_DDS::ReadInfo_out info, DDS_INSTANCE_HANDLE_T_IN instance_handle) { + DDS4CCM_TRACE ("Reader_T::read_one_last"); + ::DDS::InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); @@ -287,6 +302,8 @@ namespace CIAO ::CCM_DDS::ReadInfoSeq& infos, DDS_INSTANCE_HANDLE_T_IN instance_handle) { + DDS4CCM_TRACE ("Reader_T::read_one_all"); + ::DDS::InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); @@ -305,6 +322,7 @@ namespace CIAO Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::query (void) { DDS4CCM_TRACE ("Reader_T::query"); + return this->condition_manager_->query (); } @@ -325,6 +343,7 @@ namespace CIAO ConditionManager * condition_manager) { DDS4CCM_TRACE ("Reader_T::set_dds_reader"); + this->dds_reader_ = TYPED_DDS_READER::_narrow (dr); if (!::CORBA::is_nil (dr) && ::CORBA::is_nil (this->dds_reader_.in ())) { diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc index 9a92fee139a..f6cdb899543 100644 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc +++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc @@ -27,4 +27,8 @@ project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib TopicListener.cpp Utils.cpp } + + specific { + install_dir = connectors/dds4ccm/impl + } } diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h index 727cadda94c..914f9f3119e 100644 --- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h +++ b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h @@ -65,8 +65,8 @@ extern DDS4CCM_Logger_Export unsigned int DDS4CCM_debug_level; #if defined (DDS4CCM_NLOGGING) # define DDS4CCM_ERROR(L, X) do {} while (0) # define DDS4CCM_DEBUG(L, X) do {} while (0) -# define DDS4CCM_PRINT_INTERNAL_EXCEPTION (L, E, X) do {} while (0) -# define DDS4CCM_PRINT_CORBA_EXCEPTION (L, E, X) do {} while (0) +# define DDS4CCM_PRINT_INTERNAL_EXCEPTION(L, E, X) do {} while (0) +# define DDS4CCM_PRINT_CORBA_EXCEPTION(L, E, X) do {} while (0) # define DDS4CCM_ERROR_RETURN(L, X, Y) return (Y) # define DDS4CCM_ERROR_BREAK(L, X) { break; } #else @@ -82,6 +82,7 @@ extern DDS4CCM_Logger_Export unsigned int DDS4CCM_debug_level; } \ } while (0) # endif + # if !defined (DDS4CCM_DEBUG) # define DDS4CCM_DEBUG(L, X) \ do { \ diff --git a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc b/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc index d6589d70acb..58d78a63dba 100644 --- a/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc +++ b/CIAO/connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc @@ -15,5 +15,9 @@ project(DDS4CCM_Logger): install, ciao_lib, taolib, acelib { Logger_Service.h Log_Macros.h } + + specific { + install_dir = connectors/dds4ccm/impl/logger + } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp index 00248ecdc41..942c7b1419f 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -484,7 +484,9 @@ namespace CIAO { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO "DDS_DomainParticipant_i::create_topic - " - "Error: RTI DDS returned a nil topic\n")); + "Error: RTI DDS returned a nil topic " + "with name <%C> and type <%C>\n", + impl_name, type_name)); delete ccm_dds_tl; return ::DDS::Topic::_nil (); } @@ -496,7 +498,7 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO "DDS_DomainParticipant_i::create_topic - " - "Successfully created topic with name %C and type %C\n", + "Successfully created topic with name <%C> and type <%C>\n", impl_name, type_name)); DPMANAGER->add_topic (this->rti_entity (), dds_tp); @@ -512,7 +514,7 @@ namespace CIAO { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_DomainParticipant_i::create_topic - " - "Re-using topic with name %C and type %C.\n", + "Re-using topic with name <%C> and type <%C>.\n", impl_name, type_name)); DPMANAGER->_inc_ref (this->rti_entity (), dds_tp); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp index 226333eea71..43c7b648f02 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp @@ -241,6 +241,9 @@ namespace CIAO { if (iter->second->_ref_count () == 1) { + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO + "DomainParticipantManager::remove_participant - " + "Delete participant since ref_count is one. \n")); delete iter->second; // Save to remove from list @@ -248,12 +251,12 @@ namespace CIAO } else { + iter->second->_dec_ref (); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_TRACE, DDS4CCM_INFO "DomainParticipantManager::remove_participant - " "Don't delete participant since " - "it's still used - ref_count <%d>\n", + "it's still used - ref_count is still <%d>\n", iter->second->_ref_count ())); - iter->second->_dec_ref (); return false; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc index 6994be18eb2..677f9eba314 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc +++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc @@ -36,4 +36,8 @@ project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_idltocpp_stub, taolib, \ WaitSet.cpp Utils.cpp } + + specific { + install_dir = connectors/dds4ccm/impl/ndds + } } diff --git a/CIAO/connectors/dds4ccm/models/README b/CIAO/connectors/dds4ccm/models/README index 835ce6b9a95..0e2d641da94 100644 --- a/CIAO/connectors/dds4ccm/models/README +++ b/CIAO/connectors/dds4ccm/models/README @@ -1,10 +1,10 @@ -README +$Id$ In order to use dds4ccm correctly, you must first create a PICML -model of the dds4ccm IDL files that can be used as a GME library -(called a PICML library from this point forward) for an project +model of the dds4ccm IDL files that can be used as a GME library +(called a PICML library from this point forward) for an project that uses dds4ccm. The PICML library for dds4ccm needs to be created -only once and each time the IDL changes. To create the dds4ccm +only once and each time the IDL changes. To create the dds4ccm PICML library, please execute steps: %> cd $CIAO_ROOT diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp index c59cf3ae60f..b6a0c8c1a71 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp @@ -466,237 +466,245 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) DummyPublisherListener * pub_listener = 0; ::DDS::Publisher * pub = 0; - ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_); - domain_id_ = id; - - if (parse_args (argc, argv) != 0) + try { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error arguments.\n"))); - return 1; - } + ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_); + domain_id_ = id; - (void) ACE_High_Res_Timer::global_scale_factor (); - ACE_Reactor::instance ()->timer_queue()->gettimeofday (&ACE_High_Res_Timer::gettimeofday_hr); - - /* Create the domain participant */ - DDSDomainParticipant * participant = - DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id_, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!participant) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Sender : Unable to create domain participant.\n"))); - goto clean_exit; - } + if (parse_args (argc, argv) != 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Error arguments.\n"))); + return 1; + } - /* Register type before creating topic */ - type_name = LatencyTestTypeSupport::get_type_name(); - retcode = LatencyTestTypeSupport::register_type (participant, - type_name); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } + (void) ACE_High_Res_Timer::global_scale_factor (); + ACE_Reactor::instance ()->timer_queue()->gettimeofday (&ACE_High_Res_Timer::gettimeofday_hr); + + /* Create the domain participant */ + DDSDomainParticipant * participant = + DDSDomainParticipantFactory::get_instance()-> + create_participant_with_profile( + domain_id_, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!participant) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Sender : Unable to create domain participant.\n"))); + goto clean_exit; + } - send_topic = participant->create_topic_with_profile ( - "send", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!send_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } + /* Register type before creating topic */ + type_name = LatencyTestTypeSupport::get_type_name(); + retcode = LatencyTestTypeSupport::register_type (participant, + type_name); + if (retcode != DDS_RETCODE_OK) + { + goto clean_exit; + } - receive_topic = participant->create_topic_with_profile ( - "receive", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!receive_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } + send_topic = participant->create_topic_with_profile ( + "send", + type_name, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!send_topic) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); + goto clean_exit; + } - pub_listener = new DummyPublisherListener (); - pub = participant->create_publisher_with_profile ( - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); + receive_topic = participant->create_topic_with_profile ( + "receive", + type_name, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!receive_topic) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); + goto clean_exit; + } - if (!pub) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n"))); - goto clean_exit; - } + pub_listener = new DummyPublisherListener (); + pub = participant->create_publisher_with_profile ( + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); - /* Create the data writer using the publisher */ - data_writer = pub->create_datawriter_with_profile( - send_topic, - lib_name_, - prof_name_, - pub_listener, - DDS_OFFERED_DEADLINE_MISSED_STATUS | - DDS_OFFERED_INCOMPATIBLE_QOS_STATUS | - DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS | - DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS | - DDS_LIVELINESS_LOST_STATUS | - DDS_PUBLICATION_MATCHED_STATUS); - - if (!data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; + if (!pub) { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n"))); + goto clean_exit; } - /* Create a data reader, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector. - */ - if (both_read_write_) - { - dum_data_reader = participant->create_datareader_with_profile( - send_topic, - lib_name_, - prof_name_, - &dum_listener, - DDS_DATA_AVAILABLE_STATUS); - - if (!dum_data_reader ) + /* Create the data writer using the publisher */ + data_writer = pub->create_datawriter_with_profile( + send_topic, + lib_name_, + prof_name_, + pub_listener, + DDS_OFFERED_DEADLINE_MISSED_STATUS | + DDS_OFFERED_INCOMPATIBLE_QOS_STATUS | + DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS | + DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS | + DDS_LIVELINESS_LOST_STATUS | + DDS_PUBLICATION_MATCHED_STATUS); + + if (!data_writer) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); goto clean_exit; } - } - - data_reader = participant->create_datareader_with_profile( - receive_topic, - lib_name_, - prof_name_, - &listener, - DDS_DATA_AVAILABLE_STATUS); - if (!data_reader) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - /* Create a data writer, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector - */ - if (both_read_write_) - { - dum_data_writer = participant->create_datawriter_with_profile( - receive_topic, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!dum_data_writer) + /* Create a data reader, which will not be used, but is there for + * compatibility with DDS4CCM latency test, where there is always a + * reader and a writer per connector. + */ + if (both_read_write_) + { + dum_data_reader = participant->create_datareader_with_profile( + send_topic, + lib_name_, + prof_name_, + &dum_listener, + DDS_DATA_AVAILABLE_STATUS); + + if (!dum_data_reader ) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n"))); goto clean_exit; } - } + } - /* Create data sample for writing */ - instance_ = LatencyTestTypeSupport::create_data (); - if (instance_ == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); - goto clean_exit; - } + data_reader = participant->create_datareader_with_profile( + receive_topic, + lib_name_, + prof_name_, + &listener, + DDS_DATA_AVAILABLE_STATUS); + if (!data_reader) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); + goto clean_exit; + } + + /* Create a data writer, which will not be used, but is there for + * compatibility with DDS4CCM latency test, where there is always a + * reader and a writer per connector + */ + if (both_read_write_) + { + dum_data_writer = participant->create_datawriter_with_profile( + receive_topic, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!dum_data_writer) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n"))); + goto clean_exit; + } + } - init_values(); + /* Create data sample for writing */ + instance_ = LatencyTestTypeSupport::create_data (); + if (instance_ == 0) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); + goto clean_exit; + } - test_data_writer_ = LatencyTestDataWriter::narrow (data_writer); - if (!test_data_writer_) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n"))); - goto clean_exit; - } + init_values(); - // Sleep a couple seconds to allow discovery to happen - ACE_OS::sleep (5); + test_data_writer_ = LatencyTestDataWriter::narrow (data_writer); + if (!test_data_writer_) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n"))); + goto clean_exit; + } - // handle writing of messages - start(); + // Sleep a couple seconds to allow discovery to happen + ACE_OS::sleep (5); - /* --- Clean Up --- */ - ACE_OS::sleep (5); - main_result = 0; + // handle writing of messages + start(); -clean_exit: - const char * read_write_str; - if (both_read_write_) - { - read_write_str = "Used a extra dummy reader and writer per topic."; - } - else - { - read_write_str = "Used a reader for one topic and a writer for other topic."; - } + /* --- Clean Up --- */ + ACE_OS::sleep (5); + main_result = 0; - if((nr_of_runs_ -1) != datalen_idx_) - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" - " Number of messages sent of last run (%u): %u\n" - "%C\n\n", - datalen_idx_, - nr_of_runs_, - datalen_idx_ + 1, - number_of_msg_, - read_write_str)); - } - else - { - ACE_UINT64 test_time_usec = end_time_test_ - start_time_test_; - - double sec = (double)test_time_usec / (1000 * 1000); - ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " - "%u messages in %3.3f seconds.\n" - "%C\n\n", + clean_exit: + const char * read_write_str; + if (both_read_write_) + { + read_write_str = "Used a extra dummy reader and writer per topic."; + } + else + { + read_write_str = "Used a reader for one topic and a writer for other topic."; + } + + if((nr_of_runs_ -1) != datalen_idx_) + { + ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" + " Number of messages sent of last run (%u): %u\n" + "%C\n\n", + datalen_idx_, nr_of_runs_, + datalen_idx_ + 1, number_of_msg_, - sec, read_write_str)); - } - ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n", - unexpected_count_)); - if (participant) - { - retcode = participant->delete_contained_entities (); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant (participant); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - delete [] datalen_range_; - delete [] duration_times_; - delete pub_listener; - return main_result; + } + else + { + ACE_UINT64 test_time_usec = end_time_test_ - start_time_test_; + + double sec = (double)test_time_usec / (1000 * 1000); + ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " + "%u messages in %3.3f seconds.\n" + "%C\n\n", + nr_of_runs_, + number_of_msg_, + sec, + read_write_str)); + } + ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n", + unexpected_count_)); + if (participant) + { + retcode = participant->delete_contained_entities (); + if (retcode != DDS_RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); + main_result = 1; + } + retcode = DDSDomainParticipantFactory::get_instance()-> + delete_participant (participant); + if (retcode != DDS_RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); + main_result = 1; + } + } + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :"); + main_result = 1; + } + delete [] datalen_range_; + delete [] duration_times_; + delete pub_listener; + return main_result; } void HelloListener::on_data_available(DDSDataReader *reader) diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp index c268a516144..fb193621fce 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp @@ -433,228 +433,240 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) DummyPublisherListener * pub_listener = 0; ::DDS::Publisher * pub = 0; - ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_); - domain_id_ = id; - - if (parse_args (argc, argv) != 0) + try { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error arguments.\n"))); - return 1; - } + ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id_); + domain_id_ = id; - /* Create the domain participant */ - DDSDomainParticipant * participant = - DDSDomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id_, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!participant) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Sender : Unable to create domain participant.\n"))); - goto clean_exit; - } - - /* Register type before creating topic */ - type_name = LatencyTestTypeSupport::get_type_name(); - retcode = LatencyTestTypeSupport::register_type (participant, - type_name); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } + if (parse_args (argc, argv) != 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Error arguments.\n"))); + return 1; + } - send_topic = participant->create_topic_with_profile ( - "send", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!send_topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } + /* Create the domain participant */ + DDSDomainParticipant * participant = + DDSDomainParticipantFactory::get_instance()-> + create_participant_with_profile( + domain_id_, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!participant) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Sender : Unable to create domain participant.\n"))); + goto clean_exit; + } - receive_topic = participant->create_topic_with_profile ( - "receive", - type_name, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!receive_topic) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } + /* Register type before creating topic */ + type_name = LatencyTestTypeSupport::get_type_name(); + retcode = LatencyTestTypeSupport::register_type (participant, + type_name); + if (retcode != DDS_RETCODE_OK) + { + goto clean_exit; + } - pub_listener = new DummyPublisherListener (); - pub = participant->create_publisher_with_profile ( - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); + send_topic = participant->create_topic_with_profile ( + "send", + type_name, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!send_topic) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); + goto clean_exit; + } - if (!pub) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n"))); - goto clean_exit; - } + receive_topic = participant->create_topic_with_profile ( + "receive", + type_name, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!receive_topic) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); + goto clean_exit; + } - /* Create the data writer using the publisher */ - data_writer = pub->create_datawriter_with_profile( - send_topic, - lib_name_, - prof_name_, - pub_listener, - DDS_OFFERED_DEADLINE_MISSED_STATUS | - DDS_OFFERED_INCOMPATIBLE_QOS_STATUS | - DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS | - DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS | - DDS_LIVELINESS_LOST_STATUS | - DDS_PUBLICATION_MATCHED_STATUS); - if (!data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } - - /* Create a data reader, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector. - */ - if (both_read_write_) - { - dum_data_reader = participant->create_datareader_with_profile( - send_topic, + pub_listener = new DummyPublisherListener (); + pub = participant->create_publisher_with_profile ( lib_name_, prof_name_, - &dum_listener, - DDS_DATA_AVAILABLE_STATUS); + 0, + DDS_STATUS_MASK_NONE); - if (!dum_data_reader ) + if (!pub) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create publisher.\n"))); goto clean_exit; } - } - data_reader = participant->create_datareader_with_profile( - receive_topic, + /* Create the data writer using the publisher */ + data_writer = pub->create_datawriter_with_profile( + send_topic, lib_name_, prof_name_, - &listener, - DDS_DATA_AVAILABLE_STATUS); - if (!data_reader) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); - goto clean_exit; - } - - /* Create a data writer, which will not be used, but is there for - * compatibility with DDS4CCM latency test, where there is always a - * reader and a writer per connector - */ - if (both_read_write_) - { - dum_data_writer = participant->create_datawriter_with_profile( - receive_topic, - lib_name_, - prof_name_, - 0, - DDS_STATUS_MASK_NONE); - if (!dum_data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n"))); - goto clean_exit; - } - } - - /* Create data sample for writing */ - instance_ = LatencyTestTypeSupport::create_data (); - if (instance_ == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); - goto clean_exit; - } - - init_values(); - - test_data_writer_ = LatencyTestDataWriter::narrow (data_writer); - if (!test_data_writer_) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n"))); - goto clean_exit; - } - - // Sleep a couple seconds to allow discovery to happen - ACE_OS::sleep (5); - - // handle writing of messages - start(); - - /* --- Clean Up --- */ - ACE_OS::sleep (5); - main_result = 0; - -clean_exit: - const char * read_write_str = 0; - if (both_read_write_) - { - read_write_str = "Used a extra dummy reader and writer per topic."; - } - else - { - read_write_str = "Used a reader for one topic and a writer for other topic."; - } - - if((nr_of_runs_ -1) != datalen_idx_) - { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" - " Number of messages sent of last run (%u): %u\n" - "%C\n\n", - datalen_idx_, - nr_of_runs_, - datalen_idx_ + 1, - number_of_msg_, - read_write_str)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " - "%u messages.\n" - "%C\n\n", + pub_listener, + DDS_OFFERED_DEADLINE_MISSED_STATUS | + DDS_OFFERED_INCOMPATIBLE_QOS_STATUS | + DDS_RELIABLE_WRITER_CACHE_CHANGED_STATUS | + DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS | + DDS_LIVELINESS_LOST_STATUS | + DDS_PUBLICATION_MATCHED_STATUS); + if (!data_writer) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); + goto clean_exit; + } + + /* Create a data reader, which will not be used, but is there for + * compatibility with DDS4CCM latency test, where there is always a + * reader and a writer per connector. + */ + if (both_read_write_) + { + dum_data_reader = participant->create_datareader_with_profile( + send_topic, + lib_name_, + prof_name_, + &dum_listener, + DDS_DATA_AVAILABLE_STATUS); + + if (!dum_data_reader ) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data reader.\n"))); + goto clean_exit; + } + } + + data_reader = participant->create_datareader_with_profile( + receive_topic, + lib_name_, + prof_name_, + &listener, + DDS_DATA_AVAILABLE_STATUS); + if (!data_reader) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data reader.\n"))); + goto clean_exit; + } + + /* Create a data writer, which will not be used, but is there for + * compatibility with DDS4CCM latency test, where there is always a + * reader and a writer per connector + */ + if (both_read_write_) + { + dum_data_writer = participant->create_datawriter_with_profile( + receive_topic, + lib_name_, + prof_name_, + 0, + DDS_STATUS_MASK_NONE); + if (!dum_data_writer) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create dummy data writer.\n"))); + goto clean_exit; + } + } + + /* Create data sample for writing */ + instance_ = LatencyTestTypeSupport::create_data (); + if (instance_ == 0) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); + goto clean_exit; + } + + init_values(); + + test_data_writer_ = LatencyTestDataWriter::narrow (data_writer); + if (!test_data_writer_) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("LatencyTestDataWriter_narrow failed.\n"))); + goto clean_exit; + } + + // Sleep a couple seconds to allow discovery to happen + ACE_OS::sleep (5); + + // handle writing of messages + start(); + + /* --- Clean Up --- */ + ACE_OS::sleep (5); + main_result = 0; + + clean_exit: + const char * read_write_str = 0; + if (both_read_write_) + { + read_write_str = "Used a extra dummy reader and writer per topic."; + } + else + { + read_write_str = "Used a reader for one topic and a writer for other topic."; + } + + if((nr_of_runs_ -1) != datalen_idx_) + { + ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" + " Number of messages sent of last run (%u): %u\n" + "%C\n\n", + datalen_idx_, nr_of_runs_, + datalen_idx_ + 1, number_of_msg_, read_write_str)); - } - ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n", - unexpected_count_)); - if (participant) - { - retcode = participant->delete_contained_entities (); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = DDSDomainParticipantFactory::get_instance()-> - delete_participant (participant); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } - delete [] datalen_range_; - delete [] duration_times_; - delete pub_listener; - return main_result; + } + else + { + ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " + "%u messages.\n" + "%C\n\n", + nr_of_runs_, + number_of_msg_, + read_write_str)); + } + ACE_DEBUG ((LM_DEBUG, "\tNumber of unexpected events : %u\n", + unexpected_count_)); + if (participant) + { + retcode = participant->delete_contained_entities (); + if (retcode != DDS_RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); + main_result = 1; + } + retcode = DDSDomainParticipantFactory::get_instance()-> + delete_participant (participant); + if (retcode != DDS_RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); + main_result = 1; + } + } + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :"); + main_result = 1; + } + + delete [] datalen_range_; + delete [] duration_times_; + delete pub_listener; + + return main_result; } void HelloListener::on_data_available(DDSDataReader *reader) diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml index 2f2e923b7d0..4fcb6ea7d51 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp index 27520706a94..34f4b66dd63 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp @@ -158,162 +158,170 @@ CORBA::UShort domain_id = 0; int main_result = 1; /* error by default */ - ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id); - domain_id = id; + try + { + ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id); + domain_id = id; - if (parse_args (argc, argv) != 0) - return 1; + if (parse_args (argc, argv) != 0) + return 1; - /* Create the domain participant */ - ::DDS::DomainParticipant *participant = - ::DDS::DomainParticipantFactory::get_instance()-> - create_participant_with_profile( - domain_id, /* Domain ID */ - lib_name, - part_name, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!participant) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to create domain participant.\n"))); - goto clean_exit; - } + /* Create the domain participant */ + ::DDS::DomainParticipant *participant = + ::DDS::DomainParticipantFactory::get_instance()-> + create_participant_with_profile( + domain_id, /* Domain ID */ + lib_name, + part_name, /* QoS */ + 0, /* Listener */ + DDS_STATUS_MASK_NONE); + if (!participant) { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Unable to create domain participant.\n"))); + goto clean_exit; + } - /* Register type before creating topic */ - type_name = ThroughputTestTypeSupport::get_type_name(); - retcode = ThroughputTestTypeSupport::register_type( - participant, type_name); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } - topic = participant->create_topic( - "Test data", /* Topic name*/ - type_name, /* Type name */ - DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); + /* Register type before creating topic */ + type_name = ThroughputTestTypeSupport::get_type_name(); + retcode = ThroughputTestTypeSupport::register_type( + participant, type_name); + if (retcode != DDS_RETCODE_OK) + { + goto clean_exit; + } + topic = participant->create_topic( + "Test data", /* Topic name*/ + type_name, /* Type name */ + DDS_TOPIC_QOS_DEFAULT, /* Topic QoS */ + 0, /* Listener */ + DDS_STATUS_MASK_NONE); - if (!topic) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } + if (!topic) { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); + goto clean_exit; + } - /* Register type before creating topic */ - type_name_cmd = ThroughputCommandTypeSupport::get_type_name(); - retcode = ThroughputCommandTypeSupport::register_type( - participant, type_name_cmd); - if (retcode != DDS_RETCODE_OK) - { - goto clean_exit; - } - /* Create the topic "Command World" for the String type */ - cmd_topic = participant->create_topic("Command data", /* Topic name*/ - type_name_cmd , /* Type name */ - DDS_TOPIC_QOS_DEFAULT,/* Topic QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!topic) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); - goto clean_exit; - } + /* Register type before creating topic */ + type_name_cmd = ThroughputCommandTypeSupport::get_type_name(); + retcode = ThroughputCommandTypeSupport::register_type( + participant, type_name_cmd); + if (retcode != DDS_RETCODE_OK) + { + goto clean_exit; + } + /* Create the topic "Command World" for the String type */ + cmd_topic = participant->create_topic("Command data", /* Topic name*/ + type_name_cmd , /* Type name */ + DDS_TOPIC_QOS_DEFAULT,/* Topic QoS */ + 0, /* Listener */ + DDS_STATUS_MASK_NONE); + if (!topic) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create topic.\n"))); + goto clean_exit; + } - /* Create the command writer using the default publisher */ - cmd_writer = participant->create_datawriter_with_profile( - cmd_topic, - lib_name, - cmd_prof_name, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!cmd_writer) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to create cmd data writer.\n"))); - goto clean_exit; - } + /* Create the command writer using the default publisher */ + cmd_writer = participant->create_datawriter_with_profile( + cmd_topic, + lib_name, + cmd_prof_name, /* QoS */ + 0, /* Listener */ + DDS_STATUS_MASK_NONE); + if (!cmd_writer) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Unable to create cmd data writer.\n"))); + goto clean_exit; + } - /* Create the data writer using the default publisher */ - data_writer = participant->create_datawriter_with_profile( - topic, - lib_name, - prof_name, /* QoS */ - 0, /* Listener */ - DDS_STATUS_MASK_NONE); - if (!data_writer) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); - goto clean_exit; - } + /* Create the data writer using the default publisher */ + data_writer = participant->create_datawriter_with_profile( + topic, + lib_name, + prof_name, /* QoS */ + 0, /* Listener */ + DDS_STATUS_MASK_NONE); + if (!data_writer) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data writer.\n"))); + goto clean_exit; + } - /* Create data sample for writing */ - instance = ThroughputTestTypeSupport::create_data(); - if (instance == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); - goto clean_exit; - } - overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULongLong); - instance->key = 1; - instance->seq_num = 0; - //instance->data.maximum (MAX_DATA_SEQUENCE_LENGTH); - instance->data.length(datalen - overhead_size); + /* Create data sample for writing */ + instance = ThroughputTestTypeSupport::create_data(); + if (instance == 0) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create data sample.\n"))); + goto clean_exit; + } + overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULongLong); + instance->key = 1; + instance->seq_num = 0; + //instance->data.maximum (MAX_DATA_SEQUENCE_LENGTH); + instance->data.length(datalen - overhead_size); - /* Create data sample for writing */ - instance_cmd = ThroughputCommandTypeSupport::create_data(); - if (instance_cmd == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create command sample.\n"))); - goto clean_exit; - } + /* Create data sample for writing */ + instance_cmd = ThroughputCommandTypeSupport::create_data(); + if (instance_cmd == 0) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to create command sample.\n"))); + goto clean_exit; + } - /* Perform a safe type-cast from a generic data writer into a - * specific data writer for the types "ThroughputTestDataWriter" - * and "ThroughputCommandDataWriter" - */ - test_data_writer = ThroughputTestDataWriter::narrow(data_writer); - cmd_data_writer = ThroughputCommandDataWriter::narrow(cmd_writer); - if (!test_data_writer || !cmd_data_writer) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n"))); - goto clean_exit; - } + /* Perform a safe type-cast from a generic data writer into a + * specific data writer for the types "ThroughputTestDataWriter" + * and "ThroughputCommandDataWriter" + */ + test_data_writer = ThroughputTestDataWriter::narrow(data_writer); + cmd_data_writer = ThroughputCommandDataWriter::narrow(cmd_writer); + if (!test_data_writer || !cmd_data_writer) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("DDS_StringDataWriter_narrow failed.\n"))); + goto clean_exit; + } - // Sleep a couple seconds to allow discovery to happen - ACE_OS::sleep (1); + // Sleep a couple seconds to allow discovery to happen + ACE_OS::sleep (1); - /* --- Write Data ----------------------------------------------------- */ - for(CORBA::ULong i = start_load; i < (max_load + incr_load); i+= incr_load) - { - write(); - ACE_OS::sleep (5); - } + /* --- Write Data ----------------------------------------------------- */ + for(CORBA::ULong i = start_load; i < (max_load + incr_load); i+= incr_load) + { + write(); + ACE_OS::sleep (5); + } - /* --- Clean Up ------------------------------------------------------- */ - ACE_OS::sleep (5); + /* --- Clean Up ------------------------------------------------------- */ + ACE_OS::sleep (5); - main_result = 0; + main_result = 0; clean_exit: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting."))); - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %Q\n", - (number_of_msg))); - if (participant) - { - retcode = participant->delete_contained_entities(); - if (retcode != DDS_RETCODE_OK) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - retcode = ::DDS::DomainParticipantFactory::get_instance()-> - delete_participant(participant); - if (retcode != DDS_RETCODE_OK) + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Exiting."))); + ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %Q\n", + (number_of_msg))); + if (participant) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); - main_result = 1; - } - } + retcode = participant->delete_contained_entities(); + if (retcode != DDS_RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); + main_result = 1; + } + retcode = ::DDS::DomainParticipantFactory::get_instance()-> + delete_participant(participant); + if (retcode != DDS_RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); + main_result = 1; + } + } + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("ERROR : Unexpected CORBA exception caught :"); + main_result = 1; + } return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml index 94ab97ccfee..93f3319b188 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README index 5c60c72c2ab..2a22b1d6a1f 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README @@ -1,3 +1,4 @@ +$Id$ These tests test the performance with different options. @@ -18,7 +19,7 @@ These tests test the performance with different options. To test changes in the next attributes, changes this values in the publisher cdp-files: latency_count : indicates the number of messages minus 1 between two latency messages iterations : the number of messages from one instance to send. 0 = INFINITY . -datalen: the datalen of a message (minimal 32). -sleep: time in ms to sleep before writing the next message -spin: number of times to do a code loop before writing the next message, sleep has to be 0 . -keys: number of instances. (default 1) MORE THEN 1 NOT IMPLEMENTED YET.
\ No newline at end of file +datalen: the datalen of a message (minimal 32). +sleep: time in ms to sleep before writing the next message +spin: number of times to do a code loop before writing the next message, sleep has to be 0 . +keys: number of instances. (default 1) MORE THEN 1 NOT IMPLEMENTED YET.
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml index 75652bdc499..e348e31142e 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README index e586f7b0b2b..53962467bcf 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README @@ -1,3 +1,4 @@ +$Id$ This performace test (LatencyTT) shows the latency , round trip time, with two topics. One for sending from publisher to subscriber and one for sending back from subscriber to publicher. diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml index 2f2e923b7d0..4fcb6ea7d51 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml index 647120542f3..0a66efb0cdf 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml index eba082c0c92..1ddebcc169b 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml index 4909dda9e67..b54b9f9401a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml index f5822812b66..4b477f09725 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml index ab5f2e91a0f..5109152a096 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml index e01f0c1cd0a..46917838b42 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml index 9fae24fedcf..b14bb4f48db 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl new file mode 100644 index 00000000000..7cf07c81a11 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl @@ -0,0 +1,21 @@ +// $Id$ + +#ifndef COLLACATED_BASE_ +#define COLLACATED_BASE_ + +#pragma ndds typesupport "Base/Collocated_BaseSupport.h" +#pragma opendds typesupport "Base/Collocated_BaseTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "CoPubSub::Test_msg" + +module CoPubSub { + struct Test_msg { + string hello; + long msgId; + }; + typedef sequence <Test_msg> Test_msgSeq; +}; + + +#endif // COLLACATED_BASE_ + diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc new file mode 100644 index 00000000000..958f6ebbd66 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (Collocated_Base_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname = Collocated_Base_stub + dynamicflags += COLLACATED_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=COLLACATED_BASE_STUB_Export \ + -Wb,stub_export_include=Collocated_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + Collocated_Base.idl + } + + opendds_ts_flags += --export=COLLACATED_BASE_STUB_Export + + DDSGenerator_Files { + Collocated_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl new file mode 100644 index 00000000000..e5083387d94 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl @@ -0,0 +1,18 @@ +//$Id$ + +#ifndef COLLACATED_CONNECTOR_ +#define COLLACATED_CONNECTOR_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/Collocated_Base.idl" + +#pragma ciao lem "Connector/Collocated_ConnectorE.idl" + +module CoPubSub { + module CCM_DDS::Typed <Test_msg, Test_msgSeq> Test_conn; +}; + +#endif // COLLACATED_CONNECTOR_ + diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc new file mode 100644 index 00000000000..a75a0b6274a --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc @@ -0,0 +1,147 @@ +// $Id$ + +project(Collocated_Connector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=Collocated_Connector_stub_export.h \ + -Wb,skel_export_macro=COLLACATED_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=Collocated_Connector_svnt_export.h \ + -Wb,svnt_export_macro=COLLACATED_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=Collocated_Connector_svnt_export.h \ + -Wb,conn_export_macro=COLLACATED_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=Collocated_Connector_conn_export.h \ + -I .. + + IDL_Files { + Collocated_Connector.idl + } +} + +project(Collocated_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += Collocated_Connector_idl_gen + idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=Collocated_Connector_lem_stub_export.h \ + -SS -Gxhst -Sci \ + -I .. + + IDL_Files { + Collocated_ConnectorE.idl + } +} + +project(Collocated_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += Collocated_Connector_lem_gen Collocated_Connector_stub Collocated_Base_stub + libs += Collocated_Base_stub Collocated_Connector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Collocated_Connector_lem_stub + dynamicflags += COLLACATED_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Collocated_ConnectorEC.cpp + } + + Header_Files { + Collocated_ConnectorEC.h + Collocated_Connector_lem_stub_export.h + } + + Inline_Files { + Collocated_ConnectorEC.inl + } +} + +project(Collocated_Connector_stub) : ccm_stub, dds4ccm_base { + after += Collocated_Connector_idl_gen Collocated_Base_stub + libs += Collocated_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Collocated_Connector_stub + dynamicflags += COLLACATED_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Collocated_ConnectorC.cpp + } + + Header_Files { + Collocated_ConnectorC.h + Collocated_Connector_stub_export.h + } + + Inline_Files { + Collocated_ConnectorC.inl + } +} + +project(Collocated_Connector_exec) : ciao_executor, dds4ccm_impl { + after += Collocated_Connector_lem_stub Collocated_Connector_stub \ + Collocated_Base_stub + sharedname = Collocated_Connector_exec + libs += Collocated_Connector_stub Collocated_Connector_lem_stub \ + Collocated_Base_stub Collocated_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += COLLACATED_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Collocated_Connector_conn.cpp + } + + Header_Files { + Collocated_Connector_conn.h + Collocated_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project(Collocated_Connector_svnt) : ciao_servant, dds4ccm_impl { + after += Collocated_Connector_lem_stub \ + Collocated_Connector_exec \ + Collocated_Connector_stub + sharedname = Collocated_Connector_svnt + libs += Collocated_Connector_stub \ + Collocated_Connector_lem_stub \ + Collocated_Base_stub \ + Collocated_Connector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += COLLACATED_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Collocated_ConnectorS.cpp + Collocated_Connector_svnt.cpp + } + + Header_Files { + Collocated_ConnectorS.h + Collocated_Connector_svnt.h + Collocated_Connector_svnt_export.h + } + + Inline_Files { + Collocated_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl new file mode 100644 index 00000000000..0615dec14df --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl @@ -0,0 +1,16 @@ +// $Id$ + +#ifndef PUBSUB_COMPONENT_ +#define PUBSUB_COMPONENT_ + +#include <Components.idl> +#include "Connector/Collocated_Connector.idl" + +module CoPubSub { + component PubSub_comp { + port Test_conn::DDS_Write TestPub; + port Test_conn::DDS_Listen TestSub; + }; +}; + +#endif // PUBSUB_COMPONENT_ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc new file mode 100644 index 00000000000..502644612a9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc @@ -0,0 +1,146 @@ +// $Id$ + +project(PubSubComponent_idl_gen) : componentidldefaults, dds4ccm { + after += Collocated_Connector_idl_gen DDS_Starter_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \ + -Wb,stub_export_include=PubSub_Component_stub_export.h \ + -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \ + -Wb,skel_export_include=PubSub_Component_svnt_export.h \ + -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \ + -Wb,svnt_export_include=PubSub_Component_svnt_export.h \ + -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \ + -Wb,exec_export_include=PubSub_Component_exec_export.h \ + -I .. + + IDL_Files { + PubSub_Component.idl + } +} + +project(PubSubComponent_lem_gen) : ciaoidldefaults, dds4ccm { + after += PubSubComponent_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \ + -Wb,stub_export_include=PubSubComponent_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors -I .. + + IDL_Files { + PubSub_ComponentE.idl + } +} + +project(PubSubComponent_lem_stub) : ccm_svnt, dds4ccm_base { + after += PubSubComponent_lem_gen PubSubComponent_stub \ + Collocated_Base_stub + libs += Collocated_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = PubSub_Component_lem_stub + dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PubSub_ComponentEC.cpp + } + + Header_Files { + PubSub_ComponentEC.h + PubSub_Component_lem_stub_export.h + } + + Inline_Files { + PubSub_ComponentEC.inl + } +} + +project(PubSubComponent_stub) : ccm_stub, dds4ccm_base { + after += PubSubComponent_idl_gen Collocated_Base_stub \ + Collocated_Connector_stub + libs += Collocated_Base_stub Collocated_Connector_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = PubSub_Component_stub + dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PubSub_ComponentC.cpp + } + + Header_Files { + PubSub_ComponentC.h + PubSub_Component_stub_export.h + } + + Inline_Files { + PubSub_ComponentC.inl + } +} + +project(PubSubComponent_exec) : ciao_executor, dds4ccm_lem_stub { + after += PubSubComponent_lem_stub PubSubComponent_stub \ + Collocated_Connector_lem_stub Collocated_Connector_stub + sharedname = PubSub_Component_exec + libs += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \ + Collocated_Connector_lem_stub Collocated_Connector_stub + libpaths += ../lib + includes += .. + libout = ../lib + dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PubSub_Component_exec.cpp + } + + Header_Files { + PubSub_Component_exec.h + PubSub_Component_exec_export.h + } + + Inline_Files { + } +} + + +project(PubSubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += Collocated_Base_stub PubSubComponent_lem_stub \ + Collocated_Connector_stub \ + Collocated_Connector_svnt Collocated_Connector_lem_stub + sharedname = PubSub_Component_svnt + libs += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \ + Collocated_Connector_stub Collocated_Connector_svnt \ + Collocated_Connector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PubSub_ComponentS.cpp + PubSub_Component_svnt.cpp + } + + Header_Files { + PubSub_ComponentS.h + PubSub_Component_svnt.h + PubSub_Component_svnt_export.h + } + + Inline_Files { + PubSub_ComponentS.inl + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp new file mode 100644 index 00000000000..3fdc5b19acc --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp @@ -0,0 +1,303 @@ +// -*- C++ -*- +// $Id$ + +#include "PubSub_Component_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_CoPubSub_PubSub_comp_Impl +{ + + + /** + * WriteHandler + */ + WriteHandler::WriteHandler (PubSub_comp_exec_i &callback) + : callback_ (callback) + { + } + + int + WriteHandler::handle_timeout (const ACE_Time_Value &, const void *) + { + return this->callback_.tick (); + } + + /** + * Facet Executor Implementation Class: TestSub_data_listener_exec_i + */ + + TestSub_data_listener_exec_i::TestSub_data_listener_exec_i ( + ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx) + : ciao_context_ ( + ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx)) + { + } + + TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void) + { + } + + // Operations from ::CoPubSub::Test_conn::Listener + + void + TestSub_data_listener_exec_i::on_one_data ( + const ::CoPubSub::Test_msg & datum, + const ::CCM_DDS::ReadInfo & /* info */) + { + ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - " + "New data received: <%C> - <%d>\n", + datum.hello.in (), datum.msgId)); + } + + void + TestSub_data_listener_exec_i::on_many_data ( + const ::CoPubSub::Test_msgSeq & /* data */, + const ::CCM_DDS::ReadInfoSeq & /* infos */) + { + /* Your code here. */ + } + + /** + * Facet Executor Implementation Class: TestSub_status_exec_i + */ + + TestSub_status_exec_i::TestSub_status_exec_i ( + ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx) + : ciao_context_ ( + ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx)) + { + } + + TestSub_status_exec_i::~TestSub_status_exec_i (void) + { + } + + // Operations from ::CCM_DDS::PortStatusListener + + void + TestSub_status_exec_i::on_requested_deadline_missed ( + ::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + TestSub_status_exec_i::on_sample_lost ( + ::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) + { + /* Your code here. */ + } + + /** + * Component Executor Implementation Class: PubSub_comp_exec_i + */ + + PubSub_comp_exec_i::PubSub_comp_exec_i (void) + : count_(-3) + { + ticker_ = new WriteHandler (*this); + } + + PubSub_comp_exec_i::~PubSub_comp_exec_i (void) + { + delete this->ticker_; + } + + // Supported operations and attributes. + ACE_Reactor* + PubSub_comp_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + int + PubSub_comp_exec_i::tick (void) + { + CoPubSub::Test_msg sample; + sample.hello = CORBA::string_dup("CoPubSub Test Message"); + sample.msgId = ++this->count_; + + // Reference to the writer interface for the DDS4CCM connector for msg type + ::CoPubSub::Test_conn::Writer_var writer; + + writer = ciao_context_->get_connection_TestPub_data(); + + if (CORBA::is_nil(writer.in())) + { + ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - Writer seems nil.\n")); + return -1; // Don't reschedule timer + } + + try + { + writer->write_one(sample, DDS::HANDLE_NIL); + ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::tick - " + "Sample has been written: <%C> - <%d>\n", + sample.hello.in (), sample.msgId)); + } + catch (CCM_DDS::InternalError & ex) // catch "normal" exception + { + ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - " + "ERROR: caught InternalError.\n")); + + return -1; // Don't reschedule timer + } + catch (const CORBA::Exception & ex) + { + ex._tao_print_exception("PubSub_comp_exec_i::tick - ERROR: "); + return -1; // Don't reschedule timer + } + catch (...) // catch everything else. If this is called something is wrong + { + ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - " + "ERROR: caught unknown exception.\n")); + return -1; // Don't reschedule timer + } + return 0; + } + + // Component attributes and port operations. + + ::CoPubSub::Test_conn::CCM_Listener_ptr + PubSub_comp_exec_i::get_TestSub_data_listener (void) + { + if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ())) + { + TestSub_data_listener_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + TestSub_data_listener_exec_i ( + this->ciao_context_.in ()), + ::CoPubSub::Test_conn::CCM_Listener::_nil ()); + + this->ciao_TestSub_data_listener_ = tmp; + } + + return + ::CoPubSub::Test_conn::CCM_Listener::_duplicate ( + this->ciao_TestSub_data_listener_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + PubSub_comp_exec_i::get_TestSub_status (void) + { + if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ())) + { + TestSub_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + TestSub_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_TestSub_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_TestSub_status_.in ()); + } + + // Operations from Components::SessionComponent. + + void + PubSub_comp_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::CoPubSub::CCM_PubSub_comp_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + PubSub_comp_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + PubSub_comp_exec_i::ccm_activate (void) + { + CCM_DDS::DataListenerControl_var control = + ciao_context_->get_connection_TestSub_data_control(); + + if (! CORBA::is_nil(control.in())) + { + try + { + control->mode(CCM_DDS::ONE_BY_ONE); + } + catch (const CORBA::Exception & ex) + { + ex._tao_print_exception("PubSub_comp_exec_i::ccm_activate - ERROR: "); + } + } + else + { + ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - " + "ERROR: Data listener control seems nil.\n")); + } + + ACE_Time_Value delay(3, 0); // timer = 3 seconds + 0 usec = 3 sec + ACE_Time_Value repeat(3, 0); // timer = 3 seconds + 0 usec = 3 sec + + if (this->reactor()->schedule_timer(this->ticker_, + 0, + delay, + repeat) == -1) + { + ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - " + "ERROR: Unable to schedule timer.\n")); + } + else + ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::ccm_activate - " + "Timer is up and running.\n")); + } + + void + PubSub_comp_exec_i::ccm_passivate (void) + { + this->reactor()->cancel_timer(this->ticker_); + } + + void + PubSub_comp_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr + create_CoPubSub_PubSub_comp_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + PubSub_comp_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h new file mode 100644 index 00000000000..6a1cb4a8d71 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h @@ -0,0 +1,171 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_ +#define CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_ + +#include /**/ "ace/pre.h" + +#include "PubSub_ComponentEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "PubSub_Component_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIAO_CoPubSub_PubSub_comp_Impl +{ + class PubSub_comp_exec_i; + + /** + * WriteHandler + */ + class WriteHandler : + public ACE_Event_Handler + { + public: + WriteHandler (PubSub_comp_exec_i &callback); + virtual int handle_timeout (const ACE_Time_Value &, const void *); + private: + PubSub_comp_exec_i &callback_; + }; + + + /** + * Provider Executor Implementation Class: TestSub_data_listener_exec_i + */ + + class TestSub_data_listener_exec_i + : public virtual ::CoPubSub::Test_conn::CCM_Listener, + public virtual ::CORBA::LocalObject + { + public: + TestSub_data_listener_exec_i ( + ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx); + virtual ~TestSub_data_listener_exec_i (void); + + /** @name Operations and attributes from CoPubSub::Test_conn::Listener */ + //@{ + + virtual + void on_one_data ( + const ::CoPubSub::Test_msg & datum, + const ::CCM_DDS::ReadInfo & info); + + virtual + void on_many_data ( + const ::CoPubSub::Test_msgSeq & data, + const ::CCM_DDS::ReadInfoSeq & infos); + //@} + + private: + ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_; + }; + + /** + * Provider Executor Implementation Class: TestSub_status_exec_i + */ + + class TestSub_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + TestSub_status_exec_i ( + ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx); + virtual ~TestSub_status_exec_i (void); + + /** @name Operations and attributes from CCM_DDS::PortStatusListener */ + //@{ + + virtual + void on_requested_deadline_missed ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_; + }; + + /** + * Component Executor Implementation Class: PubSub_comp_exec_i + */ + + class PubSub_comp_exec_i + : public virtual PubSub_comp_Exec, + public virtual ::CORBA::LocalObject + { + public: + PubSub_comp_exec_i (void); + virtual ~PubSub_comp_exec_i (void); + + /** @name Supported operations and attributes. */ + //@{ + + //@} + + /** @name Component attributes and port operations. */ + //@{ + + virtual ::CoPubSub::Test_conn::CCM_Listener_ptr + get_TestSub_data_listener (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_TestSub_status (void); + //@} + + /** @name Operations from Components::SessionComponent. */ + //@{ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + /** @name User defined public operations. */ + //@{ + int tick (void); + + //@} + + private: + ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_; + + /** @name Component attributes. */ + //@{ + ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_; + //@} + + /** @name User defined members. */ + //@{ + WriteHandler *ticker_; + + ::CORBA::Long count_; + //@} + + /** @name User defined private operations. */ + //@{ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr + create_CoPubSub_PubSub_comp_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl new file mode 100644 index 00000000000..a10072c233f --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl @@ -0,0 +1,15 @@ +// $Id$ + +#ifndef SUB_COMPONENT_ +#define SUB_COMPONENT_ + +#include <Components.idl> +#include "Connector/Collocated_Connector.idl" + +module CoPubSub { + component Sub_comp { + port Test_conn::DDS_Listen TestSub; + }; +}; + +#endif // SUB_COMPONENT_ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc new file mode 100644 index 00000000000..86ed3573eb7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc @@ -0,0 +1,146 @@ +// $Id$ + +project(SubComponent_idl_gen) : componentidldefaults, dds4ccm { + after += Collocated_Connector_idl_gen DDS_Starter_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \ + -Wb,stub_export_include=Sub_Component_stub_export.h \ + -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \ + -Wb,skel_export_include=Sub_Component_svnt_export.h \ + -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \ + -Wb,svnt_export_include=Sub_Component_svnt_export.h \ + -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \ + -Wb,exec_export_include=Sub_Component_exec_export.h \ + -I .. + + IDL_Files { + Sub_Component.idl + } +} + +project(SubComponent_lem_gen) : ciaoidldefaults, dds4ccm { + after += SubComponent_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \ + -Wb,stub_export_include=SubComponent_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors -I .. + + IDL_Files { + Sub_ComponentE.idl + } +} + +project(SubComponent_lem_stub) : ccm_svnt, dds4ccm_base { + after += SubComponent_lem_gen SubComponent_stub \ + Collocated_Base_stub + libs += Collocated_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Sub_Component_lem_stub + dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Sub_ComponentEC.cpp + } + + Header_Files { + Sub_ComponentEC.h + Sub_Component_lem_stub_export.h + } + + Inline_Files { + Sub_ComponentEC.inl + } +} + +project(SubComponent_stub) : ccm_stub, dds4ccm_base { + after += SubComponent_idl_gen Collocated_Base_stub \ + Collocated_Connector_stub + libs += Collocated_Base_stub Collocated_Connector_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sub_Component_stub + dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Sub_ComponentC.cpp + } + + Header_Files { + Sub_ComponentC.h + Sub_Component_stub_export.h + } + + Inline_Files { + Sub_ComponentC.inl + } +} + +project(SubComponent_exec) : ciao_executor, dds4ccm_lem_stub { + after += SubComponent_lem_stub SubComponent_stub \ + Collocated_Connector_lem_stub Collocated_Connector_stub + sharedname = Sub_Component_exec + libs += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \ + Collocated_Connector_lem_stub Collocated_Connector_stub + libpaths += ../lib + includes += .. + libout = ../lib + dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Sub_Component_exec.cpp + } + + Header_Files { + Sub_Component_exec.h + Sub_Component_exec_export.h + } + + Inline_Files { + } +} + + +project(SubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += Collocated_Base_stub SubComponent_lem_stub \ + Collocated_Connector_stub \ + Collocated_Connector_svnt Collocated_Connector_lem_stub + sharedname = Sub_Component_svnt + libs += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \ + Collocated_Connector_stub Collocated_Connector_svnt \ + Collocated_Connector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Sub_ComponentS.cpp + Sub_Component_svnt.cpp + } + + Header_Files { + Sub_ComponentS.h + Sub_Component_svnt.h + Sub_Component_svnt_export.h + } + + Inline_Files { + Sub_ComponentS.inl + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp new file mode 100644 index 00000000000..faaa7e51fe8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp @@ -0,0 +1,201 @@ +// -*- C++ -*- +// $Id$ + +#include "Sub_Component_exec.h" + +namespace CIAO_CoPubSub_Sub_comp_Impl +{ + + /** + * Facet Executor Implementation Class: TestSub_data_listener_exec_i + */ + + TestSub_data_listener_exec_i::TestSub_data_listener_exec_i ( + ::CoPubSub::CCM_Sub_comp_Context_ptr ctx) + : ciao_context_ ( + ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx)) + { + } + + TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void) + { + } + + // Operations from ::CoPubSub::Test_conn::Listener + + void + TestSub_data_listener_exec_i::on_one_data ( + const ::CoPubSub::Test_msg & datum, + const ::CCM_DDS::ReadInfo & /* info */) + { + ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - " + "New data received: <%C> - <%d>\n", + datum.hello.in (), datum.msgId)); + } + + void + TestSub_data_listener_exec_i::on_many_data ( + const ::CoPubSub::Test_msgSeq & /* data */, + const ::CCM_DDS::ReadInfoSeq & /* infos */) + { + /* Your code here. */ + } + + /** + * Facet Executor Implementation Class: TestSub_status_exec_i + */ + + TestSub_status_exec_i::TestSub_status_exec_i ( + ::CoPubSub::CCM_Sub_comp_Context_ptr ctx) + : ciao_context_ ( + ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx)) + { + } + + TestSub_status_exec_i::~TestSub_status_exec_i (void) + { + } + + // Operations from ::CCM_DDS::PortStatusListener + + void + TestSub_status_exec_i::on_requested_deadline_missed ( + ::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + TestSub_status_exec_i::on_sample_lost ( + ::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) + { + /* Your code here. */ + } + + /** + * Component Executor Implementation Class: Sub_comp_exec_i + */ + + Sub_comp_exec_i::Sub_comp_exec_i (void){ + } + + Sub_comp_exec_i::~Sub_comp_exec_i (void) + { + } + + // Supported operations and attributes. + + // Component attributes and port operations. + + ::CoPubSub::Test_conn::CCM_Listener_ptr + Sub_comp_exec_i::get_TestSub_data_listener (void) + { + if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ())) + { + TestSub_data_listener_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + TestSub_data_listener_exec_i ( + this->ciao_context_.in ()), + ::CoPubSub::Test_conn::CCM_Listener::_nil ()); + + this->ciao_TestSub_data_listener_ = tmp; + } + + return + ::CoPubSub::Test_conn::CCM_Listener::_duplicate ( + this->ciao_TestSub_data_listener_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Sub_comp_exec_i::get_TestSub_status (void) + { + if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ())) + { + TestSub_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + TestSub_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_TestSub_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_TestSub_status_.in ()); + } + + // Operations from Components::SessionComponent. + + void + Sub_comp_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::CoPubSub::CCM_Sub_comp_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sub_comp_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Sub_comp_exec_i::ccm_activate (void) + { + CCM_DDS::DataListenerControl_var control = + ciao_context_->get_connection_TestSub_data_control(); + + if (! CORBA::is_nil(control.in())) + { + try + { + control->mode(CCM_DDS::ONE_BY_ONE); + } + catch (const CORBA::Exception & ex) + { + ex._tao_print_exception("Sub_comp_exec_i::ccm_activate - ERROR: "); + } + } + else + { + ACE_ERROR ((LM_ERROR, "Sub_comp_exec_i::ccm_activate - " + "ERROR: Listener control is nil.\n")); + } + } + + void + Sub_comp_exec_i::ccm_passivate (void) + { + /* Your code here. */ + } + + void + Sub_comp_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr + create_CoPubSub_Sub_comp_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sub_comp_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h new file mode 100644 index 00000000000..d43763f78f4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h @@ -0,0 +1,150 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_ +#define CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_ + +#include /**/ "ace/pre.h" + +#include "Sub_ComponentEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Sub_Component_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIAO_CoPubSub_Sub_comp_Impl +{ + + /** + * Provider Executor Implementation Class: TestSub_data_listener_exec_i + */ + + class TestSub_data_listener_exec_i + : public virtual ::CoPubSub::Test_conn::CCM_Listener, + public virtual ::CORBA::LocalObject + { + public: + TestSub_data_listener_exec_i ( + ::CoPubSub::CCM_Sub_comp_Context_ptr ctx); + virtual ~TestSub_data_listener_exec_i (void); + + /** @name Operations and attributes from CoPubSub::Test_conn::Listener */ + //@{ + + virtual + void on_one_data ( + const ::CoPubSub::Test_msg & datum, + const ::CCM_DDS::ReadInfo & info); + + virtual + void on_many_data ( + const ::CoPubSub::Test_msgSeq & data, + const ::CCM_DDS::ReadInfoSeq & infos); + //@} + + private: + ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_; + }; + + /** + * Provider Executor Implementation Class: TestSub_status_exec_i + */ + + class TestSub_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + TestSub_status_exec_i ( + ::CoPubSub::CCM_Sub_comp_Context_ptr ctx); + virtual ~TestSub_status_exec_i (void); + + /** @name Operations and attributes from CCM_DDS::PortStatusListener */ + //@{ + + virtual + void on_requested_deadline_missed ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_; + }; + + /** + * Component Executor Implementation Class: Sub_comp_exec_i + */ + + class Sub_comp_exec_i + : public virtual Sub_comp_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sub_comp_exec_i (void); + virtual ~Sub_comp_exec_i (void); + + /** @name Supported operations and attributes. */ + //@{ + + //@} + + /** @name Component attributes and port operations. */ + //@{ + + virtual ::CoPubSub::Test_conn::CCM_Listener_ptr + get_TestSub_data_listener (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_TestSub_status (void); + //@} + + /** @name Operations from Components::SessionComponent. */ + //@{ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + /** @name User defined public operations. */ + //@{ + + //@} + + private: + ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_; + + /** @name Component attributes. */ + //@{ + ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_; + //@} + + /** @name User defined members. */ + //@{ + + //@} + + /** @name User defined private operations. */ + //@{ + + //@} + }; + + extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr + create_CoPubSub_Sub_comp_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp new file mode 100644 index 00000000000..5dead0833fe --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp @@ -0,0 +1,654 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>CollocatedDepl_1</label> + <UUID>CollocatedDepl_1</UUID> + + <implementation xmi:id="SubComponentImplementation"> + <name>SubComponentImplementation</name> + <source/> + <artifact xmi:idref="Sub_Component_ExecArtifact" /> + <artifact xmi:idref="Sub_Component_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see 10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_CoPubSub_Sub_comp_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_CoPubSub_Sub_comp_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sub_Component_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sub_Component_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="PubSubComponentImplementation"> + <name>PubSubComponentImplementation</name> + <source/> + <artifact xmi:idref="PubSub_Component_ExecArtifact" /> + <artifact xmi:idref="PubSub_Component_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see 10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_CoPubSub_PubSub_comp_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_CoPubSub_PubSub_comp_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PubSub_Component_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>PubSub_Component_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="CollocatedConnectorComponentImplementation"> + <name>CollocatedConnectorComponentImplementation</name> + <source/> + <artifact xmi:idref="Collocated_Connector_ExecArtifact" /> + <artifact xmi:idref="Collocated_Connector_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see 10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_CoPubSub_Test_conn_DDS_Event_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_CoPubSub_Test_conn_DDS_Event_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Collocated_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Collocated_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <!-- SubComponent1 and its connector --> + <instance xmi:id="SubComponentInstance1"> + <name>SubComponent1</name> + <node>Node</node> + <source/> + <implementation xmi:idref="SubComponentImplementation" /> + </instance> + + <instance xmi:id="SubComponent1Connector"> + <name>SubComponent1Connector</name> + <node>Node</node> + <source/> + <implementation xmi:idref="CollocatedConnectorComponentImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>CollocatedTopic</string> + </value> + </value> + </configProperty> + <configProperty> + <name>push_consumer_filter</name> + <value> + <type> + <kind>tk_struct</kind> + <struct> + <name>QueryFilter</name> + <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId> + <member> + <name>expression</name> + <type> + <kind>tk_string</kind> + </type> + </member> + <member> + <name>parameters</name> + <type> + <kind>tk_sequence</kind> + <sequence> + <elementType> + <kind>tk_string</kind> + </elementType> + </sequence> + </type> + </member> + </struct> + </type> + <value> + <member> + <name>expression</name> + <value> + <string>msgId < %0</string> + </value> + </member> + <member> + <name>parameters</name> + <value> + <element> + <string>1</string> + </element> + </value> + </member> + </value> + </value> + </configProperty> + </instance> + + <!-- SubComponent2 and its connector --> + <instance xmi:id="SubComponentInstance2"> + <name>SubComponent2</name> + <node>Node</node> + <source/> + <implementation xmi:idref="SubComponentImplementation" /> + </instance> + + <instance xmi:id="SubComponent2Connector"> + <name>SubComponent2Connector</name> + <node>Node</node> + <source/> + <implementation xmi:idref="CollocatedConnectorComponentImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>CollocatedTopic</string> + </value> + </value> + </configProperty> + <configProperty> + <name>push_consumer_filter</name> + <value> + <type> + <kind>tk_struct</kind> + <struct> + <name>QueryFilter</name> + <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId> + <member> + <name>expression</name> + <type> + <kind>tk_string</kind> + </type> + </member> + <member> + <name>parameters</name> + <type> + <kind>tk_sequence</kind> + <sequence> + <elementType> + <kind>tk_string</kind> + </elementType> + </sequence> + </type> + </member> + </struct> + </type> + <value> + <member> + <name>expression</name> + <value> + <string>msgId < %0</string> + </value> + </member> + <member> + <name>parameters</name> + <value> + <element> + <string>1</string> + </element> + </value> + </member> + </value> + </value> + </configProperty> + </instance> + + <!-- PubSubComponent and its connector --> + <instance xmi:id="PubSubComponentInstance"> + <name>PubSubComponent</name> + <node>Node</node> + <source/> + <implementation xmi:idref="PubSubComponentImplementation" /> + </instance> + + <instance xmi:id="PubSubComponentConnector"> + <name>PubSubComponentConnector</name> + <node>Node</node> + <source/> + <implementation xmi:idref="CollocatedConnectorComponentImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>CollocatedTopic</string> + </value> + </value> + </configProperty> + <configProperty> + <name>push_consumer_filter</name> + <value> + <type> + <kind>tk_struct</kind> + <struct> + <name>QueryFilter</name> + <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId> + <member> + <name>expression</name> + <type> + <kind>tk_string</kind> + </type> + </member> + <member> + <name>parameters</name> + <type> + <kind>tk_sequence</kind> + <sequence> + <elementType> + <kind>tk_string</kind> + </elementType> + </sequence> + </type> + </member> + </struct> + </type> + <value> + <member> + <name>expression</name> + <value> + <string>msgId < %0</string> + </value> + </member> + <member> + <name>parameters</name> + <value> + <element> + <string>1</string> + </element> + </value> + </member> + </value> + </value> + </configProperty> + </instance> + + <!-- pubsub writer connection --> + <connection> + <name>writer_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestPub_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="PubSubComponentInstance"/> + </internalEndpoint> + <internalEndpoint> + <portName>supplier_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="PubSubComponentConnector"/> + </internalEndpoint> + </connection> + + <!-- pub sub listener connections --> + <connection> + <name>pubsub_listener_filter</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_filter_config</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="PubSubComponentInstance"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_filter_config</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="PubSubComponentConnector"/> + </internalEndpoint> + </connection> + + <connection> + <name>pubsub_data_listener</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_data_listener</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="PubSubComponentInstance"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="PubSubComponentConnector"/> + </internalEndpoint> + </connection> + + <connection> + <name>pubsub_listener_control</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_data_control</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="PubSubComponentInstance"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_control</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="PubSubComponentConnector"/> + </internalEndpoint> + </connection> + + <!-- sub1 listener connections --> + <connection> + <name>sub1_listener_filter</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_filter_config</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SubComponentInstance1"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_filter_config</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SubComponent1Connector"/> + </internalEndpoint> + </connection> + + <connection> + <name>sub1_data_listener</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_data_listener</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SubComponentInstance1"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SubComponent1Connector"/> + </internalEndpoint> + </connection> + + <connection> + <name>sub1_listener_control</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_data_control</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SubComponentInstance1"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_control</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SubComponent1Connector"/> + </internalEndpoint> + </connection> + + <!-- sub2 listener connections --> + <connection> + <name>sub2_listener_filter</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_filter_config</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SubComponentInstance2"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_filter_config</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SubComponent2Connector"/> + </internalEndpoint> + </connection> + + <connection> + <name>sub2_data_listener</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_data_listener</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SubComponentInstance2"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SubComponent2Connector"/> + </internalEndpoint> + </connection> + + <connection> + <name>sub2_listener_control</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>TestSub_data_control</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SubComponentInstance2"/> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_control</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SubComponent2Connector"/> + </internalEndpoint> + </connection> + + <artifact xmi:id="Collocated_Connector_ExecArtifact"> + <name>Collocated_Connector_exec</name> + <source/> + <node/> + <location>Collocated_Connector_exec</location> + </artifact> + <artifact xmi:id="Collocated_Connector_SvntArtifact"> + <name>Collocated_Connector_svnt</name> + <source/> + <node/> + <location>Collocated_Connector_svnt</location> + </artifact> + <artifact xmi:id="Collocated_Connector_StubArtifact"> + <name>Collocated_Connector_stub</name> + <source/> + <node/> + <location>Collocated_Connector_stub</location> + </artifact> + + <artifact xmi:id="Sub_Component_ExecArtifact"> + <name>Sub_Component_exec</name> + <source/> + <node/> + <location>Sub_Component_exec</location> + </artifact> + <artifact xmi:id="Sub_Component_SvntArtifact"> + <name>Sub_Component_svnt</name> + <source/> + <node/> + <location>Sub_Component_svnt</location> + </artifact> + <artifact xmi:id="Sub_Component_StubArtifact"> + <name>Sub_Component_stub</name> + <source/> + <node/> + <location>Sub_Component_stub</location> + </artifact> + + <artifact xmi:id="PubSub_Component_ExecArtifact"> + <name>PubSub_Component_exec</name> + <source/> + <node/> + <location>PubSub_Component_exec</location> + </artifact> + <artifact xmi:id="PubSub_Component_SvntArtifact"> + <name>PubSub_Component_svnt</name> + <source/> + <node/> + <location>PubSub_Component_svnt</location> + </artifact> + <artifact xmi:id="PubSub_Component_StubArtifact"> + <name>PubSub_Component_stub</name> + <source/> + <node/> + <location>PubSub_Component_stub</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="PubSubComponentInstance"/> + <constrainedInstance xmi:idref="PubSubComponentConnector"/> + </localityConstraint> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="SubComponentInstance1"/> + <constrainedInstance xmi:idref="SubComponent1Connector"/> + <constrainedInstance xmi:idref="SubComponentInstance2"/> + <constrainedInstance xmi:idref="SubComponent2Connector"/> + </localityConstraint> + +</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl new file mode 100755 index 00000000000..2a6ecd3b4e8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl @@ -0,0 +1,244 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60001 ); +@iorbases = ( "NodeApp.ior" ); +@iorfiles = 0; +@nodenames = ( "Node" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 30 seconds to allow task to complete\n"; +sleep (30); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README index bf2f8489894..9c089fb7f17 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README @@ -1,3 +1,5 @@ +$Id$ + This test will test whether the ContentFilteredTopic on the DDS_Get and DDS_Read port works and that these ContentFilteredTopics are not shared among the ports. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml index 715a2372174..eb473a154e0 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/README b/CIAO/connectors/dds4ccm/tests/DDSEntity/README index 3e19d586624..11bb140c74a 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/README +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ Test which shows how to use the DDSDataWriter and DDSDataReader directly. diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README index 02691d71506..c9c266d1fcd 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This test tests all possible connections between a Sender and a DDS Event connector and a Receiver and a diff --git a/CIAO/connectors/dds4ccm/tests/Getter/README b/CIAO/connectors/dds4ccm/tests/Getter/README index 1dd2164b443..67c9c239aba 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/README +++ b/CIAO/connectors/dds4ccm/tests/Getter/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This test tests the Getter. diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml index 4926ab6c674..12c9fc26031 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl new file mode 100644 index 00000000000..ee11c24c27c --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl @@ -0,0 +1,24 @@ +// $Id$ + +/** + * @file IDL_Test_Base.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef IDL_TEST_BASE_IDL +#define IDL_TEST_BASE_IDL + +#pragma ndds typesupport "Base/IDL_Test_BaseSupport.h" +#pragma opendds typesupport "Base/IDL_Test_BaseTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "IDL_Test" +#pragma DCPS_DATA_KEY "IDL_Test key" + +struct IDL_Test { + string key; //@key + long iteration; +}; + +typedef sequence<IDL_Test> IDL_TestSeq; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc new file mode 100644 index 00000000000..357f9f68406 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (IDL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname = IDL_Test_Base_stub + dynamicflags += IDL_TEST_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=IDL_TEST_BASE_STUB_Export \ + -Wb,stub_export_include=IDL_Test_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + IDL_Test_Base.idl + } + + opendds_ts_flags += --export=IDL_TEST_BASE_STUB_Export + + DDSGenerator_Files { + IDL_Test_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl new file mode 100644 index 00000000000..516f88a3fce --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl @@ -0,0 +1,18 @@ +// $Id$ + +#ifndef IDL_TEST_INTERFACES_IDL +#define IDL_TEST_INTERFACES_IDL + +#pragma ciao lem "Base/IDL_Test_InterfacesE.idl" + +interface idl_test_base_interface { + void do_something_base (); + readonly attribute string base_string_attr; +}; + +interface idl_test_derived_interface : idl_test_base_interface { + void do_something_derived (); + attribute string derived_string_attr; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc new file mode 100644 index 00000000000..d25d6d97ef2 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc @@ -0,0 +1,107 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl IDL_Test_Interfaces" + +project(IDL_Test_Interfaces_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_STUB_Export \ + -Wb,stub_export_include=IDL_Test_Interfaces_stub_export.h \ + -Wb,skel_export_macro=IDL_TEST_INTERFACES_SVNT_Export \ + -Wb,skel_export_include=IDL_Test_Interfaces_svnt_export.h \ + -Wb,exec_export_macro=IDL_TEST_INTERFACES_EXEC_Export \ + -Wb,exec_export_include=IDL_Test_Interfaces_exec_export.h + + IDL_Files { + IDL_Test_Interfaces.idl + } +} + +project(IDL_Test_Interfaces_lem_gen) : ciaoidldefaults { + after += IDL_Test_Interfaces_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_LEM_STUB_Export \ + -Wb,stub_export_include=IDL_Test_Interfaces_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + IDL_Test_InterfacesE.idl + } +} + +project(IDL_Test_Interfaces_lem_stub) : ccm_svnt { + after += IDL_Test_Interfaces_lem_gen \ + IDL_Test_Interfaces_stub + libs += IDL_Test_Interfaces_stub + libout = ../lib + libpaths += ../lib + + sharedname = IDL_Test_Interfaces_lem_stub + dynamicflags += IDL_TEST_INTERFACES_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_InterfacesEC.cpp + } + + Header_Files { + IDL_Test_InterfacesEC.h + IDL_Test_Interfaces_lem_stub_export.h + } + + Inline_Files { + IDL_Test_InterfacesEC.inl + } +} + +project(IDL_Test_Interfaces_stub) : ccm_stub { + after += IDL_Test_Interfaces_idl_gen + libs += + libout = ../lib + libpaths += ../lib + + sharedname = IDL_Test_Interfaces_stub + dynamicflags += IDL_TEST_INTERFACES_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_InterfacesC.cpp + } + + Header_Files { + IDL_Test_InterfacesC.h + IDL_Test_Interfaces_stub_export.h + } + + Inline_Files { + IDL_Test_InterfacesC.inl + } +} + +project(IDL_Test_Interfaces_svnt) : ccm_svnt { + after += IDL_Test_Interfaces_idl_gen IDL_Test_Interfaces_stub + libs += IDL_Test_Interfaces_stub + libout = ../lib + libpaths += ../lib + + sharedname = IDL_Test_Interfaces_svnt + dynamicflags += IDL_TEST_INTERFACES_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_InterfacesS.cpp + } + + Header_Files { + IDL_Test_InterfacesS.h + IDL_Test_Interfaces_svnt_export.h + } + + Inline_Files { + IDL_Test_InterfacesS.inl + } +} diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl new file mode 100644 index 00000000000..07cab5ba2e7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl @@ -0,0 +1,34 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef BASE_COMPONENT_IDL +#define BASE_COMPONENT_IDL + +#include "Connector/IDL_Test_Connector.idl" +#include "Base/IDL_Test_Interfaces.idl" + +#pragma ciao lem "IDL_Test_Base_ComponentE.idl" +// #pragma ciao lem "Base/IDL_Test_BaseE.idl" + +component IDL_Test_Base_Component +{ + port IDL_Connector::DDS_Update info_base_update; + port IDL_Connector::DDS_Read info_base_read; + port IDL_Connector::DDS_Get info_base_get; + port IDL_Connector::DDS_Listen info_base_listen; + port IDL_Connector::DDS_StateListen info_base_state_listen; + port IDL_Connector::DDS_Write info_base_write; + + provides CCM_DDS::ConnectorStatusListener base_status_listener; + + attribute long base_attr; + + uses idl_test_derived_interface uses_derived_interface; + provides idl_test_base_interface prov_base_interface; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc new file mode 100644 index 00000000000..02225917db1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc @@ -0,0 +1,178 @@ +// $Id$ + +project(IDL_Test_Base_Component_idl_gen) : componentidldefaults, dds4ccm { + custom_only = 1 + after += IDL_Test_Connector_idl_gen + idlflags += -Wb,stub_export_macro=BASE_COMPONENT_STUB_Export \ + -Wb,stub_export_include=Base_Component_stub_export.h \ + -Wb,skel_export_macro=BASE_COMPONENT_SVNT_Export \ + -Wb,skel_export_include=Base_Component_svnt_export.h \ + -Wb,svnt_export_macro=BASE_COMPONENT_SVNT_Export \ + -Wb,svnt_export_include=Base_Component_svnt_export.h \ + -Wb,exec_export_macro=BASE_COMPONENT_EXEC_Export \ + -Wb,exec_export_include=Base_Component_exec_export.h \ + -I.. -Gex + + IDL_Files { + IDL_Test_Base_Component.idl + } +} + +project(IDL_Test_Base_Component_lem_gen) : ciaoidldefaults, dds4ccm { + after += IDL_Test_Base_Component_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=BASE_COMPONENT_LEM_STUB_Export \ + -Wb,stub_export_include=Base_Component_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + IDL_Test_Base_ComponentE.idl + } +} + +project(IDL_Test_Base_Component_lem_stub) : ccm_svnt, dds4ccm_base { + after += IDL_Test_Base_Component_lem_gen \ + IDL_Test_Base_Component_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Interfaces_stub \ + IDL_Test_Interfaces_lem_stub + libs += Base_Component_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Interfaces_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Base_Component_lem_stub + dynamicflags += BASE_COMPONENT_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Base_ComponentEC.cpp + } + + Header_Files { + IDL_Test_Base_ComponentEC.h + Base_Component_lem_stub_export.h + } + + Inline_Files { + IDL_Test_Base_ComponentEC.inl + } +} + +project(IDL_Test_Base_Component_stub) : ccm_stub, dds4ccm_base { + after += IDL_Test_Base_Component_idl_gen \ + IDL_Test_Connector_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_lem_gen + libs += IDL_Test_Connector_stub \ + IDL_Test_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Base_Component_stub + dynamicflags += BASE_COMPONENT_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Base_ComponentC.cpp + } + + Header_Files { + IDL_Test_Base_ComponentC.h + Base_Component_stub_export.h + } + + Inline_Files { + IDL_Test_Base_ComponentC.inl + } +} + +project(IDL_Test_Base_Component_exec) : ciao_executor, dds4ccm_lem_stub { + after += IDL_Test_Base_Component_lem_stub \ + IDL_Test_Base_Component_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Interfaces_stub \ + IDL_Test_Interfaces_lem_stub + sharedname = Base_Component_exec + libs += Base_Component_stub \ + Base_Component_lem_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Interfaces_stub \ + IDL_Test_Interfaces_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += BASE_COMPONENT_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Base_Component_exec.cpp + } + + Header_Files { + IDL_Test_Base_Component_exec.h + Base_Component_exec_export.h + } + + Inline_Files { + } +} + + +project(IDL_Test_Base_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += IDL_Test_Base_Component_lem_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_svnt \ + IDL_Test_Base_Component_exec \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Interfaces_svnt \ + IDL_Test_Interfaces_lem_stub \ + IDL_Test_Interfaces_stub + sharedname = Base_Component_svnt + libs += Base_Component_stub \ + Base_Component_lem_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_svnt \ + Base_Component_exec \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Interfaces_svnt \ + IDL_Test_Interfaces_lem_stub \ + IDL_Test_Interfaces_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += BASE_COMPONENT_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Base_ComponentS.cpp + IDL_Test_Base_Component_svnt.cpp + } + + Header_Files { + IDL_Test_Base_ComponentS.h + IDL_Test_Base_Component_svnt.h + Base_Component_svnt_export.h + } + + Inline_Files { + IDL_Test_Base_ComponentS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl new file mode 100644 index 00000000000..24b6101f7f1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl @@ -0,0 +1,33 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef DERIVED_COMPONENT_IDL +#define DERIVED_COMPONENT_IDL + +#include "IDL_Test_Base_Component.idl" + +#pragma ciao lem "IDL_Test_Derived_ComponentE.idl" +// #pragma ciao lem "Base/IDL_Test_BaseE.idl" + +component IDL_Test_Derived_Component : IDL_Test_Base_Component +{ + port IDL_Connector::DDS_Update info_derived_update; + port IDL_Connector::DDS_Read info_derived_read; + port IDL_Connector::DDS_Get info_derived_get; + port IDL_Connector::DDS_Listen info_derived_listen; + port IDL_Connector::DDS_StateListen info_derived_state_listen; + port IDL_Connector::DDS_Write info_derived_write; + + provides CCM_DDS::ConnectorStatusListener derived_status_listener; + + attribute long derived_attr; + + provides idl_test_derived_interface prov_derived_interface; + uses idl_test_base_interface uses_base_interface; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc new file mode 100644 index 00000000000..c3ee2ecfce0 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc @@ -0,0 +1,197 @@ +// $Id$ + +project(IDL_Test_Derived_Component_idl_gen) : componentidldefaults, dds4ccm { + custom_only = 1 + after += IDL_Test_Connector_idl_gen + idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_STUB_Export \ + -Wb,stub_export_include=Derived_Component_stub_export.h \ + -Wb,skel_export_macro=DERIVED_COMPONENT_SVNT_Export \ + -Wb,skel_export_include=Derived_Component_svnt_export.h \ + -Wb,svnt_export_macro=DERIVED_COMPONENT_SVNT_Export \ + -Wb,svnt_export_include=Derived_Component_svnt_export.h \ + -Wb,exec_export_macro=DERIVED_COMPONENT_EXEC_Export \ + -Wb,exec_export_include=Derived_Component_exec_export.h \ + -I.. -Gex + + IDL_Files { + IDL_Test_Derived_Component.idl + } +} + +project(IDL_Test_Derived_Component_lem_gen) : ciaoidldefaults, dds4ccm { + after += IDL_Test_Derived_Component_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_LEM_STUB_Export \ + -Wb,stub_export_include=Derived_Component_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + IDL_Test_Derived_ComponentE.idl + } +} + +project(IDL_Test_Derived_Component_lem_stub) : ccm_svnt, dds4ccm_base { + after += IDL_Test_Derived_Component_lem_gen \ + IDL_Test_Derived_Component_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Base_stub \ + IDL_Test_Interfaces_stub \ + IDL_Test_Interfaces_lem_stub \ + IDL_Test_Base_Component_lem_stub + libs += Derived_Component_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Base_stub \ + IDL_Test_Interfaces_stub \ + Base_Component_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Derived_Component_lem_stub + dynamicflags += DERIVED_COMPONENT_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Derived_ComponentEC.cpp + } + + Header_Files { + IDL_Test_Derived_ComponentEC.h + Derived_Component_lem_stub_export.h + } + + Inline_Files { + IDL_Test_Derived_ComponentEC.inl + } +} + +project(IDL_Test_Derived_Component_stub) : ccm_stub, dds4ccm_base { + after += IDL_Test_Derived_Component_idl_gen \ + IDL_Test_Connector_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_lem_gen \ + IDL_Test_Base_Component_stub \ + IDL_Test_Base_Component_lem_stub + libs += IDL_Test_Connector_stub \ + IDL_Test_Base_stub \ + Base_Component_stub \ + Base_Component_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Derived_Component_stub + dynamicflags += DERIVED_COMPONENT_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Derived_ComponentC.cpp + } + + Header_Files { + IDL_Test_Derived_ComponentC.h + Derived_Component_stub_export.h + } + + Inline_Files { + IDL_Test_Derived_ComponentC.inl + } +} + +project(IDL_Test_Derived_Component_exec) : ciao_executor, dds4ccm_lem_stub { + after += IDL_Test_Derived_Component_lem_stub \ + IDL_Test_Derived_Component_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Base_Component_exec \ + IDL_Test_Base_Component_lem_stub \ + IDL_Test_Interfaces_lem_stub \ + IDL_Test_Interfaces_lem + sharedname = Derived_Component_exec + libs += Derived_Component_stub \ + Derived_Component_lem_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_lem_stub \ + Base_Component_exec \ + Base_Component_lem_stub \ + IDL_Test_Interfaces_lem_stub \ + IDL_Test_Interfaces_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += DERIVED_COMPONENT_EXEC_BUILD_DLL BASE_COMPONENT_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Derived_Component_exec.cpp + } + + Header_Files { + IDL_Test_Derived_Component_exec.h + Derived_Component_exec_export.h + } + + Inline_Files { + } +} + + +project(IDL_Test_Derived_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += IDL_Test_Derived_Component_lem_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_svnt \ + IDL_Test_Derived_Component_exec \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Interfaces_stub \ + IDL_Test_Interfaces_lem_stub \ + IDL_Test_Interfaces_svnt \ + IDL_Test_Base_Component_svnt \ + IDL_Test_Base_Component_lem_stub \ + IDL_Test_Base_Component_stub + sharedname = Derived_Component_svnt + libs += Derived_Component_stub \ + Derived_Component_lem_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_stub \ + IDL_Test_Connector_svnt \ + Derived_Component_exec \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Interfaces_stub \ + IDL_Test_Interfaces_lem_stub \ + IDL_Test_Interfaces_svnt \ + Base_Component_svnt \ + Base_Component_lem_stub \ + Base_Component_stub + + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += DERIVED_COMPONENT_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Derived_ComponentS.cpp + IDL_Test_Derived_Component_svnt.cpp + } + + Header_Files { + IDL_Test_Derived_ComponentS.h + IDL_Test_Derived_Component_svnt.h + Derived_Component_svnt_export.h + } + + Inline_Files { + IDL_Test_Derived_ComponentS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl new file mode 100644 index 00000000000..6e16c944627 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl @@ -0,0 +1,20 @@ +// $Id$ + +/** + * @file IDL_Test_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef IDL_TEST_CONNECTOR_IDL_ +#define IDL_TEST_CONNECTOR_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/IDL_Test_Base.idl" + +#pragma ciao lem "Connector/IDL_Test_ConnectorE.idl" + +module ::CCM_DDS::Typed < ::IDL_Test, ::IDL_TestSeq> IDL_Connector; + +#endif /* IDL_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc new file mode 100644 index 00000000000..7d8aa1f4fb1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc @@ -0,0 +1,144 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p IDL_Test_Base -l .. -o ../lib -u DDS IDL_Test_Connector" + +project(IDL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=IDL_Test_Connector_stub_export.h \ + -Wb,skel_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=IDL_Test_Connector_svnt_export.h \ + -Wb,svnt_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=IDL_Test_Connector_svnt_export.h \ + -Wb,conn_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=IDL_Test_Connector_conn_export.h \ + -I .. + + IDL_Files { + IDL_Test_Connector.idl + } +} + +project(IDL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += IDL_Test_Connector_idl_gen + idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=IDL_Test_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + IDL_Test_ConnectorE.idl + } +} + +project(IDL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += IDL_Test_Connector_lem_gen IDL_Test_Connector_stub IDL_Test_Base_stub + libs += IDL_Test_Base_stub IDL_Test_Connector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = IDL_Test_Connector_lem_stub + dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_ConnectorEC.cpp + } + + Header_Files { + IDL_Test_ConnectorEC.h + IDL_Test_Connector_lem_stub_export.h + } + + Inline_Files { + IDL_Test_ConnectorEC.inl + } +} + +project(IDL_Test_Connector_stub) : ccm_stub, dds4ccm_base { + after += IDL_Test_Connector_idl_gen IDL_Test_Base_stub + libs += IDL_Test_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = IDL_Test_Connector_stub + dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_ConnectorC.cpp + } + + Header_Files { + IDL_Test_ConnectorC.h + IDL_Test_Connector_stub_export.h + } + + Inline_Files { + IDL_Test_ConnectorC.inl + } +} + +project(IDL_Test_Connector_exec) : ciao_executor, dds4ccm_impl { + after += IDL_Test_Connector_lem_stub IDL_Test_Connector_stub + sharedname = IDL_Test_Connector_exec + libs += IDL_Test_Connector_stub IDL_Test_Connector_lem_stub IDL_Test_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_Connector_conn.cpp + } + + Header_Files { + IDL_Test_Connector_conn.h + IDL_Test_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project(IDL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { + after += IDL_Test_Connector_lem_stub IDL_Test_Connector_exec IDL_Test_Connector_stub + sharedname = IDL_Test_Connector_svnt + libs += IDL_Test_Connector_stub \ + IDL_Test_Connector_lem_stub \ + IDL_Test_Base_stub \ + IDL_Test_Connector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + IDL_Test_ConnectorS.cpp + IDL_Test_Connector_svnt.cpp + } + + Header_Files { + IDL_Test_ConnectorS.h + IDL_Test_Connector_svnt.h + IDL_Test_Connector_svnt_export.h + } + + Inline_Files { + IDL_Test_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README b/CIAO/connectors/dds4ccm/tests/InstanceHandle/README index 38242380f34..01af1e6d89a 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ Test which shows how to use the DDSDataWriter directly. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README b/CIAO/connectors/dds4ccm/tests/KeyedSamples/README index 8bc6dae4a7e..bb8054b8f52 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This test creates instances in DDS by using the updater port. After that, every instance is updated. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp index f1bcda297e7..fcae1ffefd6 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp @@ -91,34 +91,34 @@ namespace CIAO_Keyed_Test_Sender_Impl void Sender_exec_i::tick (void) { - if (this->last_key != this->ktests_.end ()) + if (this->last_key_ != this->ktests_.end ()) { try { KeyedTestConnector::Writer_var writer = this->ciao_context_->get_connection_info_write_data (); - ++this->last_key->second->iteration; - writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL); + ++this->last_key_->second->iteration; + writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"), - this->last_key->first.c_str (), - this->last_key->second->iteration)); + this->last_key_->first.c_str (), + this->last_key_->second->iteration)); } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n", - this->last_key->first.c_str ())); + this->last_key_->first.c_str ())); } - ++this->last_key; + ++this->last_key_; } else { // Onto the next iteration - this->last_key = this->ktests_.begin (); - while (this->last_key != this->ktests_.end ()) + this->last_key_ = this->ktests_.begin (); + while (this->last_key_ != this->ktests_.end ()) { - if (this->last_key->second->iteration == this->iterations_) + if (this->last_key_->second->iteration == this->iterations_) { - ++this->last_key; + ++this->last_key_; } else { @@ -229,7 +229,7 @@ namespace CIAO_Keyed_Test_Sender_Impl this->ktests_[key] = new_key; } - this->last_key = this->ktests_.begin (); + this->last_key_ = this->ktests_.begin (); } void diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h index b6085322894..c366385b14f 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h @@ -132,7 +132,7 @@ namespace CIAO_Keyed_Test_Sender_Impl typedef std::map<ACE_CString, KeyedTest_var> Keyed_Test_Table; Keyed_Test_Table ktests_; - Keyed_Test_Table::iterator last_key; + Keyed_Test_Table::iterator last_key_; //@} diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README b/CIAO/connectors/dds4ccm/tests/KeyedWriter/README index 2e2e55625dd..bdbb8c6e14a 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/README @@ -1,11 +1,11 @@ -# $Id$ +$Id$ -KeyedWriter tests the DDS_Writer. It tests write_one +KeyedWriter tests the DDS_Writer. It tests write_one and write_many, in combination with register_instance. In descriptors/USER_QOS_PROFILE.xml, max_instances is set to one. An exception should be thrown when the second -instance is registered. Every subsequent write of +instance is registered. Every subsequent write of unregistered keys, should result in an error. When invoking write_many, writing the first sample should succeed. diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml index 67ecf58f141..45161fabe8c 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/README b/CIAO/connectors/dds4ccm/tests/LateBinding/README index c8707cc50b4..f3069c50c99 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/README +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ Normally when a DDS4CCM connector starts, it prepares DDS by creating several DDS entities, like a domain participant and topic. diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp index 491fcbbcf11..e57ae4c813e 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp @@ -138,8 +138,8 @@ namespace CIAO_RG_LateBinding_Receiver_Impl this->start_reading (); this->set_topic_name_getter (); this->start_getting (); - this->set_topic_name_reader (true); - this->set_topic_name_getter (true); + this->set_topic_name_reader (); + this->set_topic_name_getter (); } void @@ -294,7 +294,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl } void - RG_LateBinding_Receiver_impl::set_topic_name_reader (bool test_non_changeable) + RG_LateBinding_Receiver_impl::set_topic_name_reader (void) { try { @@ -323,34 +323,17 @@ namespace CIAO_RG_LateBinding_Receiver_Impl "Unable to narrow connector interface\n")); throw ::CORBA::INTERNAL (); } - if (test_non_changeable) - { - conn->topic_name ("LateBindingTopicSecondTime"); - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "ERROR: No NonChangeable exception thrown.\n")); - } - else - { - conn->topic_name ("LateBindingTopic"); - } + conn->topic_name ("LateBindingTopic"); } catch (const ::CCM_DDS::NonChangeable &) { - if (test_non_changeable) - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "Expected NonChangeable caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - " - "Caught NonChangeable exception.\n")); - } + ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - " + "Caught NonChangeable exception.\n")); } } void - RG_LateBinding_Receiver_impl::set_topic_name_getter (bool test_non_changeable) + RG_LateBinding_Receiver_impl::set_topic_name_getter (void) { try { @@ -379,29 +362,12 @@ namespace CIAO_RG_LateBinding_Receiver_Impl "Unable to narrow connector interface\n")); throw ::CORBA::INTERNAL (); } - if (test_non_changeable) - { - conn->topic_name ("LateBindingTopicSecondTime"); - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "ERROR: No NonChangeable exception thrown.\n")); - } - else - { - conn->topic_name ("LateBindingTopic"); - } + conn->topic_name ("LateBindingTopic"); } catch (const ::CCM_DDS::NonChangeable &) { - if (test_non_changeable) - { - ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "Expected NonChangeable caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::set_topic_name_getter - " - "ERROR: Caught NonChangeable exception.\n")); - } + ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::set_topic_name_getter - " + "ERROR: Caught NonChangeable exception.\n")); } } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h index 786fa95e26a..43d1198c287 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h @@ -52,8 +52,8 @@ namespace CIAO_RG_LateBinding_Receiver_Impl LastSampleChecker * checker_; - void set_topic_name_reader (bool test_non_changeable=false); - void set_topic_name_getter (bool test_non_changeable=false); + void set_topic_name_reader (); + void set_topic_name_getter (); void start_reading (void); void start_getting (void); diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml index c4d169d16ee..582cd50e9da 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="LateBinding_Library"> <qos_profile name="LateBinding_Profile" is_default_qos="true"> diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp index c11c0efe344..163fb3877b1 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp @@ -53,8 +53,8 @@ namespace CIAO_WU_LateBinding_Sender_Impl else if (assingment == 1) { this->callback_.start_state_test (); - this->callback_.set_topic_name_writer (true); - this->callback_.set_topic_name_updater (true); + this->callback_.set_topic_name_writer (); + this->callback_.set_topic_name_updater (); } return 0; } @@ -139,7 +139,7 @@ namespace CIAO_WU_LateBinding_Sender_Impl } void - Sender_exec_i::set_topic_name_writer (bool test_non_changeable) + Sender_exec_i::set_topic_name_writer (void) { try { @@ -166,29 +166,16 @@ namespace CIAO_WU_LateBinding_Sender_Impl "Unable to narrow connector interface\n")); throw ::CORBA::INTERNAL (); } - if (test_non_changeable) - { - conn->topic_name ("LateBindingTopicSecondTime"); - ACE_ERROR ((LM_ERROR, "Sender_exec_i::set_topic_name_writer - " - "ERROR: No NonChangeable exception thrown.\n")); - } - else - { - conn->topic_name ("LateBindingTopic"); - } + conn->topic_name ("LateBindingTopic"); } catch (const ::CCM_DDS::NonChangeable &) { - if (test_non_changeable) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " - "Expected NonChangeable caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - "); } } @@ -234,7 +221,7 @@ namespace CIAO_WU_LateBinding_Sender_Impl } void - Sender_exec_i::set_topic_name_updater(bool test_non_changeable) + Sender_exec_i::set_topic_name_updater(void) { try { @@ -261,29 +248,16 @@ namespace CIAO_WU_LateBinding_Sender_Impl "Unable to narrow connector interface\n")); throw ::CORBA::INTERNAL (); } - if (test_non_changeable) - { - conn->topic_name ("LateBindingTopicSecondTime"); - ACE_ERROR ((LM_ERROR, "Sender_exec_i::set_topic_name_updater - " - "ERROR: No NonChangeable exception thrown.\n")); - } - else - { - conn->topic_name ("LateBindingTopic"); - } + conn->topic_name ("LateBindingTopic"); } catch (const ::CCM_DDS::NonChangeable &) { - if (test_non_changeable) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " - "Expected NonChangeable caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Caught NonChangeable exception.\n")); - } + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Caught NonChangeable exception.\n")); + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - "); } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h index 345d9dba5db..499bbe90312 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h @@ -98,8 +98,8 @@ namespace CIAO_WU_LateBinding_Sender_Impl //@{ /** User defined public operations. */ - void set_topic_name_writer (bool test_non_changeable=false); - void set_topic_name_updater (bool test_non_changeable=false); + void set_topic_name_writer (void); + void set_topic_name_updater (void); void start_event_test (void); void start_state_test (void); //@} diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README index f622af6a71d..13790dfcd57 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README @@ -1,3 +1,3 @@ -# $Id$ +$Id$ This test tests the listener.
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml index 3cdef9c6d3c..6250c0e2440 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README index f622af6a71d..13790dfcd57 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README @@ -1,3 +1,3 @@ -# $Id$ +$Id$ This test tests the listener.
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README index f622af6a71d..13790dfcd57 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README @@ -1,3 +1,3 @@ -# $Id$ +$Id$ This test tests the listener.
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp index e0939d5a991..9519d15b3f6 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp @@ -31,21 +31,19 @@ namespace CIAO_NonChangeable_NonChangeableComponent_Impl try { conn->topic_name ("nonchangeable_test"); - ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - " - "ERROR: Able to set topic name without " - "an exception.\n")); + ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_topic_name - " + "Able to reset topic name without an exception.\n")); + return true; } catch (const ::CCM_DDS::NonChangeable &) { - ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_topic_name - " - "Caught expected exception.\n")); - return true; + ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - " + "ERROR: Unable to reset topic name.\n")); } catch (...) { ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - " "ERROR: Caught unexpected exception.\n")); - return false; } return false; } diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README index 575f11fbb77..d8148b4e7af 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This test tests whether the connection attributes can be set once the configuration is complete. diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml index 0b21c25f65c..cca46104a20 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml index 3b29bbd68a4..b3bc627ee36 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml index 635dd814581..2805d431fd2 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml index 976deab9e68..42401144e55 100644 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml @@ -1,3 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <dds xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="QosProfile_Library"> <qos_profile name="QosProfile_Profile" is_default_qos="true"> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc index 1390b8ab990..7f7f0e89155 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc @@ -1,7 +1,7 @@ // $Id$ -project(Base_stub) : ndds_ts_defaults, nddslib { - sharedname = Base_stub +project(QC_Base_stub) : ndds_ts_defaults, nddslib { + sharedname = QC_Base_stub dynamicflags += NDDS_USER_DLL_EXPORT libout = ../descriptors diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc index 920505cdd81..f9ef365f6be 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc @@ -2,11 +2,11 @@ project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults { exename = DDS_receiver - after += Base_stub + after += QC_Base_stub includes += ../Base - libs += Base_stub + libs += QC_Base_stub libpaths += ../descriptors exeout += ../descriptors diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc index 72aa1a8c62a..0b7106f40f7 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc @@ -2,12 +2,12 @@ project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults { exename = DDS_Sender - after += Base_stub + after += QC_Base_stub includes += ../Base exeout += ../descriptors - libs += Base_stub + libs += QC_Base_stub libpaths += ../descriptors Source_Files { diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README index 0af0d922ffb..b4383d49225 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This is a plain DDS test, which test the use of 2 different query conditions, followed through a readcondition. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml index 791dc49ad5e..b815d8bef5d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README index 1bd40b0d86e..c9183e9c932 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This is a plain DDS test, which test the use of 2 different query conditions, followed through a readcondition. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml index 791dc49ad5e..b815d8bef5d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README index 99dab74c8af..e866035d467 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README @@ -1,3 +1,5 @@ +$Id$ + Test whether Querycondition are NOT shared between two extended ports. The receiver uses two extend ports of the DDS4CCM State connector: diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml index 715a2372174..eb473a154e0 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml index 715a2372174..eb473a154e0 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README index 615e89088a0..db48cb22003 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ The TwoQueries exists of 4 runs. During each run the Sender writes 20 samples to DDS. After that it informs the receiver that the samples were written. The receiver diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml index 715a2372174..eb473a154e0 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README index 64034e00651..75b3c2eb9a9 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ The TwoQueriesMany exists of 4 runs. During each run the Sender writes 20 samples to DDS. After that it informs the receiver that the samples were written. The receiver @@ -25,7 +25,7 @@ The following runs are defined: that, the receiver reset the QueryFilter (by setting the expression to an empty string) and informs the Sender that a new run can be started. 3. Sender writes iterations 41-60 to DDS for the defined number of keys. After - that it informs the receiver which should receive with a get_many all samples + that it informs the receiver which should receive with a get_many all samples with iterations 1-60 without the ones it read during run 1 and 2. The receiver then creates a new filter, using the same expression as used during runs 1 and 2 but with different parameters. Again the receiver informs the diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml index 68c9a0e8f5e..a901e4745ca 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc index d1cba8fd39a..6bd1f0f5365 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc @@ -1,6 +1,7 @@ // $Id$ +// This file is generated with "generate_component_mpc.pl -u DDS -d -o../lib Reader_Test_Base -project (DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { +project(DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { sharedname = DDS_Reader_Test_Base_stub dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL libout = ../lib @@ -23,4 +24,3 @@ project (DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { Source_Files { } } - diff --git a/CIAO/connectors/dds4ccm/tests/Reader/README b/CIAO/connectors/dds4ccm/tests/Reader/README index ec69fbb989d..41331a7d251 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/README +++ b/CIAO/connectors/dds4ccm/tests/Reader/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This test tests the reader. diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml index c6d5a1db716..024f845ab43 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/README b/CIAO/connectors/dds4ccm/tests/ResetTopic/README new file mode 100644 index 00000000000..8c6f0c24df0 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/README @@ -0,0 +1,34 @@ +// $Id$ + +In the early days of the DDS4CCM specification a topic name was not changable. +When it was set (doesn't matter if it was a late binded topic), the user was not +allowed to change it, otherwise a NonChangeable exception was thrown. + +The requirement from the field dictates that a topic name should be changeable. +When the topic name will be set a second time, the connector should shut down +DDS and start it again, using the new topic name. The connector does not tear +down the proxies. This means that the connector doesn't change on the outside. + +The ReadGet test has the following sequence: +1. Sender starts writing samples for TopicI +2. Sender informs the Receiver that samples has been written for TopicI +3. Receiver sets this topic name on his connector (late binding), and starts to + collect the samples. +4. Sender resets the topic name to TopicII and informs the receiver about this. +5. Receiver resets the topic name on his connector and starts collecting the + samples belonging to TopicII. + +Both listeners tests (UpdateListen and WriteListen) have about the same sequence: +1. Sender and Receiver start, writing and listening to the same topic. +2. After 10 second, the perl script starts two small executables; one to inform + the receiver to switch to topic II and one to inform the sender to switch to + topic II. The executables are spawned in this order. +3. Step one is repeated. +4. Step two will be repeated. + +The ToEmpty test will initially start writing samples for TopicI. After a while, +the topic name will be cleared. This means that the connector internally stops DDS. +After another while, the sender will start writing samples again, +but now for TopicII. This sequence repeats. + +TooLong will test whether an exception is thrown when an invalid topic name is applied. diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl new file mode 100644 index 00000000000..c4023e4d495 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl @@ -0,0 +1,24 @@ +// $Id$ + +/** + * @file RG_ResetTopic_Base.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef RG_RESETTOPIC_BASE_IDL +#define RG_RESETTOPIC_BASE_IDL + +#pragma ndds typesupport "Base/RG_ResetTopic_BaseSupport.h" +#pragma opendds typesupport "Base/RG_ResetTopic_BaseTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "RG_ResetTopicSample" +#pragma DCPS_DATA_KEY "RG_ResetTopicSample key" + +struct RG_ResetTopicSample { + string key; //@key + long iteration; +}; + +typedef sequence<RG_ResetTopicSample> RG_ResetTopicSampleSeq; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc new file mode 100644 index 00000000000..36560836af9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (RG_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname = RG_ResetTopicBase_stub + dynamicflags += RG_RESETTOPIC_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=RG_RESETTOPIC_BASE_STUB_Export \ + -Wb,stub_export_include=LateBinding_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + RG_ResetTopic_Base.idl + } + + opendds_ts_flags += --export=RG_RESETTOPIC_BASE_STUB_Export + + DDSGenerator_Files { + RG_ResetTopic_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl new file mode 100644 index 00000000000..bf198b37ea7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl @@ -0,0 +1,20 @@ +// $Id$ + +/** + * @file Reader_Starter.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef READER_STARTER_IDL +#define READER_STARTER_IDL + +#pragma ciao lem "Base/Reader_StarterE.idl" + +interface ReaderStarter +{ + void start_read (in string topic_name); + void set_reader_properties (in unsigned short nr_keys, + in unsigned short nr_iterations); +}; + +#endif /* READER_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc new file mode 100755 index 00000000000..050904fd873 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc @@ -0,0 +1,113 @@ +// $Id$ + +project(reader_starter_rt_idl_gen) : componentidldefaults, dds4ccm { + custom_only = 1 + after += + idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ + -Wb,stub_export_include=reader_starter_rt_stub_export.h \ + -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ + -Wb,skel_export_include=reader_starter_rt_svnt_export.h \ + -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ + -Wb,svnt_export_include=reader_starter_rt_svnt_export.h \ + -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ + -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. + + IDL_Files { + Reader_Starter.idl + } +} + +project(reader_starter_rt_lem_gen) : ciaoidldefaults, dds4ccm { + after += reader_starter_rt_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ + -Wb,stub_export_include=reader_starter_rt_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + Reader_StarterE.idl + } +} + +project(reader_starter_rt_lem_stub) : ccm_svnt, dds4ccm_base { + after += reader_starter_rt_lem_gen reader_starter_rt_stub + libs += reader_starter_rt_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = reader_starter_rt_lem_stub + dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Reader_StarterEC.cpp + } + + Header_Files { + Reader_StarterEC.h + reader_starter_rt_lem_stub_export.h + } + + Inline_Files { + Reader_StarterEC.inl + } +} + +project(reader_starter_rt_stub) : ccm_stub, dds4ccm_base { + after += reader_starter_rt_idl_gen + libs += + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = reader_starter_rt_stub + dynamicflags += READER_STARTER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Reader_StarterC.cpp + } + + Header_Files { + Reader_StarterC.h + reader_starter_rt_stub_export.h + } + + Inline_Files { + Reader_StarterC.inl + } +} + + +project(reader_starter_rt_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += reader_starter_rt_lem_stub reader_starter_rt_stub + sharedname = reader_starter_rt_svnt + libs += reader_starter_rt_stub reader_starter_rt_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += READER_STARTER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Reader_StarterS.cpp + Reader_Starter_svnt.cpp + } + + Header_Files { + Reader_StarterS.h + Reader_Starter_svnt.h + reader_starter_rt_svnt_export.h + } + + Inline_Files { + Reader_StarterS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl new file mode 100644 index 00000000000..1da3f3494d0 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl @@ -0,0 +1,23 @@ +// $Id$ + +/** + * @file RG_ResetTopic_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef RG_RESETTOPIC_CONNECTOR_IDL_ +#define RG_RESETTOPIC_CONNECTOR_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/RG_ResetTopic_Base.idl" + +#pragma ciao lem "Connector/RG_ResetTopic_ConnectorE.idl" + +module RG_ResetTopic +{ + module ::CCM_DDS::Typed < ::RG_ResetTopicSample, ::RG_ResetTopicSampleSeq> RG_ResetTopicSampleConnector; +}; + +#endif /* RG_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc new file mode 100644 index 00000000000..f5e8207275a --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc @@ -0,0 +1,148 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l .. -o ../lib -u DDS RG_ResetTopic_Connector" + +project (RG_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=LateBinding_Connector_stub_export.h \ + -Wb,skel_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \ + -Wb,svnt_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \ + -Wb,conn_export_macro=RG_RESETTOPIC_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=LateBinding_Connector_conn_export.h \ + -I .. + + IDL_Files { + RG_ResetTopic_Connector.idl + } +} + +project (RG_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += RG_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=RG_ResetTopic_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + RG_ResetTopic_ConnectorE.idl + } +} + +project (RG_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += RG_ResetTopicConnector_lem_gen RG_ResetTopicConnector_stub \ + RG_ResetTopicBase_stub + libs += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = RG_ResetTopicConnector_lem_stub + dynamicflags += RG_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_ConnectorEC.cpp + } + + Header_Files { + RG_ResetTopic_ConnectorEC.h + RG_ResetTopic_Connector_lem_stub_export.h + } + + Inline_Files { + RG_ResetTopic_ConnectorEC.inl + } +} + +project (RG_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { + after += RG_ResetTopicConnector_idl_gen RG_ResetTopicBase_stub + libs += RG_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = RG_ResetTopicConnector_stub + dynamicflags += RG_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_ConnectorC.cpp + } + + Header_Files { + RG_ResetTopic_ConnectorC.h + RG_ResetTopic_Connector_stub_export.h + } + + Inline_Files { + RG_ResetTopic_ConnectorC.inl + } +} + +project (RG_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { + after += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \ + RG_ResetTopicBase_stub + sharedname = RG_ResetTopicConnector_exec + libs += RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \ + RG_ResetTopicBase_stub RG_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RG_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_Connector_conn.cpp + } + + Header_Files { + RG_ResetTopic_Connector_conn.h + RG_ResetTopic_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project (RG_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { + after += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_exec \ + RG_ResetTopicConnector_stub + sharedname = RG_ResetTopicConnector_svnt + libs += RG_ResetTopicConnector_stub \ + RG_ResetTopicConnector_lem_stub \ + RG_ResetTopicBase_stub \ + RG_ResetTopicConnector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RG_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_ConnectorS.cpp + RG_ResetTopic_Connector_svnt.cpp + } + + Header_Files { + RG_ResetTopic_ConnectorS.h + RG_ResetTopic_Connector_svnt.h + RG_ResetTopic_Connector_svnt_export.h + } + + Inline_Files { + RG_ResetTopic_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl new file mode 100644 index 00000000000..1a3d83d66c6 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl @@ -0,0 +1,25 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef RECEIVER_IDL +#define RECEIVER_IDL + +#include "Connector/RG_ResetTopic_Connector.idl" +#include "Base/Reader_Starter.idl" + +module RG_ResetTopic +{ + component Receiver + { + port RG_ResetTopicSampleConnector::DDS_Get info_get; + port RG_ResetTopicSampleConnector::DDS_Read info_read; + + provides ReaderStarter start_reading; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc new file mode 100644 index 00000000000..fe2ed2dae50 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc @@ -0,0 +1,158 @@ +// $Id$ + +project (RG_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm { + custom_only = 1 + after += RG_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + -Wb,stub_export_include=Receiver_stub_export.h \ + -Wb,skel_export_macro=RECEIVER_SVNT_Export \ + -Wb,skel_export_include=Receiver_svnt_export.h \ + -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ + -Wb,svnt_export_include=Receiver_svnt_export.h \ + -Wb,exec_export_macro=RECEIVER_EXEC_Export \ + -Wb,exec_export_include=Receiver_exec_export.h \ + -I.. + IDL_Files { + RG_ResetTopic_Receiver.idl + } +} + +project (RG_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm { + after += RG_ResetTopicReceiver_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ + -Wb,stub_export_include=Receiver_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + RG_ResetTopic_ReceiverE.idl + } +} + +project (RG_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base { + after += RG_ResetTopicReceiver_lem_gen RG_ResetTopicReceiver_stub RG_ResetTopicConnector_stub \ + RG_ResetTopicBase_stub reader_starter_rt_stub + libs += Receiver_stub RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \ + reader_starter_rt_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Receiver_lem_stub + dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_ReceiverEC.cpp + } + + Header_Files { + RG_ResetTopic_ReceiverEC.h + Receiver_lem_stub_export.h + } + + Inline_Files { + RG_ResetTopic_ReceiverEC.inl + } +} + +project (RG_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base { + after += RG_ResetTopicReceiver_idl_gen RG_ResetTopicConnector_stub \ + RG_ResetTopicBase_stub RG_ResetTopicConnector_lem_gen \ + reader_starter_rt_stub reader_starter_rt_lem_stub + libs += RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \ + reader_starter_rt_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Receiver_stub + dynamicflags += RECEIVER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_ReceiverC.cpp + } + + Header_Files { + RG_ResetTopic_ReceiverC.h + Receiver_stub_export.h + } + + Inline_Files { + RG_ResetTopic_ReceiverC.inl + } +} + +project (RG_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += RG_ResetTopicReceiver_lem_stub RG_ResetTopicReceiver_stub \ + RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \ + RG_ResetTopicConnector_lem_stub \ + reader_starter_rt_lem_stub reader_starter_rt_stub + sharedname = Receiver_exec + libs += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \ + RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \ + reader_starter_rt_lem_stub reader_starter_rt_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RECEIVER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_Receiver_exec.cpp + RG_ResetTopic_Receiver_impl.cpp + } + + Header_Files { + RG_ResetTopic_Receiver_exec.h + RG_ResetTopic_Receiver_impl.h + Receiver_exec_export.h + } + + Inline_Files { + } +} + + +project (RG_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += RG_ResetTopicReceiver_lem_stub RG_ResetTopicBase_stub \ + RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \ + RG_ResetTopicReceiver_exec RG_ResetTopicConnector_lem_stub \ + reader_starter_rt_stub \ + reader_starter_rt_svnt reader_starter_rt_lem_stub + sharedname = Receiver_svnt + libs += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \ + RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \ + Receiver_exec RG_ResetTopicConnector_lem_stub \ + reader_starter_rt_stub reader_starter_rt_svnt \ + reader_starter_rt_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RECEIVER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_ReceiverS.cpp + RG_ResetTopic_Receiver_svnt.cpp + } + + Header_Files { + RG_ResetTopic_ReceiverS.h + RG_ResetTopic_Receiver_svnt.h + Receiver_svnt_export.h + } + + Inline_Files { + RG_ResetTopic_ReceiverS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp new file mode 100644 index 00000000000..02b5ea6f723 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp @@ -0,0 +1,283 @@ +// -*- C++ -*- +// $Id$ + +#include "RG_ResetTopic_Receiver_exec.h" +#include "RG_ResetTopic_Receiver_impl.h" + +namespace CIAO_RG_ResetTopic_Receiver_Impl +{ + + /** + * Facet Executor Implementation Class: info_get_status_exec_i + */ + + info_get_status_exec_i::info_get_status_exec_i ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + { + } + + info_get_status_exec_i::~info_get_status_exec_i (void) + { + } + + // Operations from ::CCM_DDS::PortStatusListener + + void + info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) + { + /* Your code here. */ + } + + /** + * Facet Executor Implementation Class: info_read_status_exec_i + */ + + info_read_status_exec_i::info_read_status_exec_i ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + { + } + + info_read_status_exec_i::~info_read_status_exec_i (void) + { + } + + // Operations from ::CCM_DDS::PortStatusListener + + void + info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) + { + /* Your code here. */ + } + + /** + * Facet Executor Implementation Class: start_reading_exec_i + */ + + start_reading_exec_i::start_reading_exec_i ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, + Receiver_exec_i &callback) + : ciao_context_ ( + ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + , callback_ (callback) + { + } + + start_reading_exec_i::~start_reading_exec_i (void) + { + } + + // Operations from ::ReaderStarter + + void + start_reading_exec_i::start_read (const char * topic_name) + { + this->callback_.start_read (topic_name); + } + + void + start_reading_exec_i::set_reader_properties (::CORBA::UShort nr_keys, + ::CORBA::UShort nr_iterations) + { + this->callback_.keys (nr_keys); + this->callback_.iterations (nr_iterations); + } + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + Receiver_exec_i::Receiver_exec_i (void) + : iterations_ (10) + , keys_ (5) + , impl_(0) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + delete this->impl_; + } + + // Supported operations and attributes. + ::CORBA::UShort + Receiver_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Receiver_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + if (this->impl_) + { + this->impl_->iterations (iterations); + } + } + + ::CORBA::UShort + Receiver_exec_i::keys (void) + { + return this->keys_; + } + + void + Receiver_exec_i::keys ( + const ::CORBA::UShort keys) + { + this->keys_ = keys; + if (this->impl_) + { + this->impl_->keys (keys); + } + } + + void + Receiver_exec_i::start_read (const char * topic_name) + { + if (!this->impl_) + ACE_NEW_THROW_EX (this->impl_, + RG_ResetTopic_Receiver_impl ( + this->ciao_context_.in (), + this->iterations_, + this->keys_), + ::CORBA::INTERNAL ()); + this->impl_->start (topic_name); + } + + // Component attributes and port operations. + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_get_status (void) + { + if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) + { + info_get_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_get_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_get_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_get_status_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_read_status (void) + { + if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ())) + { + info_read_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_read_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_read_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_read_status_.in ()); + } + + ::CCM_ReaderStarter_ptr + Receiver_exec_i::get_start_reading (void) + { + if ( ::CORBA::is_nil (this->ciao_start_reading_.in ())) + { + start_reading_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + start_reading_exec_i ( + this->ciao_context_.in (), + *this), + ::CCM_ReaderStarter::_nil ()); + + this->ciao_start_reading_ = tmp; + } + + return + ::CCM_ReaderStarter::_duplicate ( + this->ciao_start_reading_.in ()); + } + + // Operations from Components::SessionComponent. + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::RG_ResetTopic::CCM_Receiver_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Receiver_exec_i::ccm_activate (void) + { + /* Your code here. */ + } + + void + Receiver_exec_i::ccm_passivate (void) + { + /* Your code here. */ + } + + void + Receiver_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_RG_ResetTopic_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Receiver_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h new file mode 100644 index 00000000000..6b772b6a35e --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h @@ -0,0 +1,194 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_ +#define CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_ + +#include /**/ "ace/pre.h" + +#include "RG_ResetTopic_ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Receiver_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIAO_RG_ResetTopic_Receiver_Impl +{ + class Receiver_exec_i; + class RG_ResetTopic_Receiver_impl; + /** + * Provider Executor Implementation Class: info_get1_status_exec_i + */ + + class info_get_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + info_get_status_exec_i ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx); + virtual ~info_get_status_exec_i (void); + + /** @name Operations and attributes from CCM_DDS::PortStatusListener */ + //@{ + + virtual + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; + }; + + /** + * Provider Executor Implementation Class: info_read1_status_exec_i + */ + + class info_read_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + info_read_status_exec_i ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx); + virtual ~info_read_status_exec_i (void); + + /** @name Operations and attributes from CCM_DDS::PortStatusListener */ + //@{ + + virtual + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; + }; + + /** + * Provider Executor Implementation Class: start_reading_exec_i + */ + + class start_reading_exec_i + : public virtual ::CCM_ReaderStarter, + public virtual ::CORBA::LocalObject + { + public: + start_reading_exec_i ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, + Receiver_exec_i &callback_); + virtual ~start_reading_exec_i (void); + + /** @name Operations and attributes from ReaderStarter */ + //@{ + + virtual + void start_read (const char * topic_name); + + virtual + void set_reader_properties (::CORBA::UShort nr_keys, + ::CORBA::UShort nr_iterations); + //@} + + private: + ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; + Receiver_exec_i &callback_; + }; + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + /** @name Supported operations and attributes. */ + //@{ + + //@} + + /** @name Component attributes and port operations. */ + //@{ + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_get_status (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_read_status (void); + + virtual ::CCM_ReaderStarter_ptr + get_start_reading (void); + + virtual ::CORBA::UShort iterations (void); + + virtual void iterations (::CORBA::UShort iterations); + + virtual ::CORBA::UShort keys (void); + + virtual void keys (::CORBA::UShort keys); + //@} + + /** @name Operations from Components::SessionComponent. */ + //@{ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + /** @name User defined public operations. */ + //@{ + void + start_read (const char * topic_name); + //@} + + private: + ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; + + /** @name Component attributes. */ + //@{ + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_; + ::CCM_ReaderStarter_var ciao_start_reading_; + + ::CORBA::UShort iterations_; + + ::CORBA::UShort keys_; + //@} + + /** @name User defined members. */ + //@{ + RG_ResetTopic_Receiver_impl *impl_; + //@} + + /** @name User defined private operations. */ + //@{ + + //@} + }; + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_RG_ResetTopic_Receiver_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp new file mode 100644 index 00000000000..f25757e9552 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp @@ -0,0 +1,395 @@ +// $Id$ +#include "RG_ResetTopic_Receiver_impl.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_RG_ResetTopic_Receiver_Impl +{ + + /** + * Check last + */ + LastSampleChecker::LastSampleChecker (RG_ResetTopic_Receiver_impl &callback, + const ::CORBA::UShort &iterations) + : callback_ (callback) + , iterations_ (iterations) + { + } + + LastSampleChecker::~LastSampleChecker () + { + } + + int + LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *) + { + ACE_DEBUG ((LM_DEBUG, "Checking if last sample " + "is available in DDS...\n")); + if (this->callback_.check_last ()) + this->callback_.start_read (); + return 0; + } + + /** + * RG_ResetTopic_Receiver_impl + */ + RG_ResetTopic_Receiver_impl::RG_ResetTopic_Receiver_impl ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, + const ::CORBA::UShort & iterations, + const ::CORBA::UShort & keys) + : ciao_context_ ( + ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + , iterations_ (iterations) + , keys_ (keys) + , expected_per_run_ (keys * iterations) + , checker_ (0) + , topic_name_("") + { + } + + RG_ResetTopic_Receiver_impl::~RG_ResetTopic_Receiver_impl () + { + delete this->checker_; + } + + ACE_Reactor* + RG_ResetTopic_Receiver_impl::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void + RG_ResetTopic_Receiver_impl::iterations (::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + void + RG_ResetTopic_Receiver_impl::keys (::CORBA::UShort keys) + { + this->keys_= keys; + } + + bool + RG_ResetTopic_Receiver_impl::check_last (void) + { + ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = + this->ciao_context_->get_connection_info_read_data (); + try + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " + "last iteration should be <%02d>\n", + this->iterations_)); + RG_ResetTopicSample datum; + ::CCM_DDS::ReadInfo readinfo; + char key[10]; + ACE_OS::sprintf (key, "KEY_%d", this->keys_); + datum.key = CORBA::string_dup (key); + reader->read_one_last ( + datum, + readinfo, + ::DDS::HANDLE_NIL); + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " + "last iteration <%02d> - <%02d>\n", + datum.iteration, + this->iterations_)); + return datum.iteration >= this->iterations_; + } + catch (const ::CCM_DDS::InternalError &) + { + ACE_DEBUG ((LM_DEBUG, "INTERNAL ERROR\n")); + } + catch (const ::CCM_DDS::NonExistent &) + { + ACE_DEBUG ((LM_DEBUG, "NONEXISTENT\n")); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: " + "ERROR: Unexpected exception caught\n")); + } + return false; + } + + void + RG_ResetTopic_Receiver_impl::start (const char * topic_name) + { + this->topic_name_ = topic_name; + //only the first time... + if (!this->checker_) + this->test_exception (); + this->set_topic_name_reader (topic_name); + + if (!this->checker_) + ACE_NEW_THROW_EX (this->checker_, + LastSampleChecker (*this, + this->iterations_), + ::CORBA::NO_MEMORY ()); + if (this->reactor ()->schedule_timer (this->checker_, + 0, + ACE_Time_Value (1, 0), + ACE_Time_Value (1, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - " + "ERROR: Error while starting LastSampleChecker\n")); + } + } + + void + RG_ResetTopic_Receiver_impl::start_read (void) + { + if (this->checker_) + { + this->reactor ()->cancel_timer (this->checker_); + } + this->start_reading (); + this->set_topic_name_getter (this->topic_name_.c_str()); + this->start_getting (); + } + + void + RG_ResetTopic_Receiver_impl::check_samples ( + const char * test, + const RG_ResetTopicSampleSeq& samples, + const ::CORBA::UShort& expected) + { + bool error = samples.length () != expected; + if (ACE_OS::strcmp (test, "get") == 0) + { + error = !(samples.length () > 0); + } + if (error) + { + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::check_samples - " + "ERROR: Unexpected number of %C samples received: " + "expected <%d> - received <%u>\n", + test, + expected, + samples.length ())); + } + else + { + ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - " + "%C Samples found: <%u>\n", + test, + samples.length ())); + } + for (::CORBA::ULong i = 0; + i < samples.length (); + ++i) + { + ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - " + "Sample %C: sample <%d> - key <%C> - iteration <%d>\n", + test, + i, + samples[i].key.in (), + samples[i].iteration)); + } + } + + void + RG_ResetTopic_Receiver_impl::test_exception (void) + { + try + { + if (! ::CORBA::is_nil (this->ciao_context_.in ())) + { + ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = + this->ciao_context_->get_connection_info_read_data (); + if (::CORBA::is_nil (reader.in ())) + { + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " + "ERROR: Unable to get reader interface from the " + "CIAO context\n")); + return; + } + + RG_ResetTopicSample sample; + ::CCM_DDS::ReadInfo readinfo; + sample.key = CORBA::string_dup ("KEY_1"); + reader->read_one_last (sample, + readinfo, + ::DDS::HANDLE_NIL); + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " + "ERROR: No exception caught before topic name has been set\n")); + } + else + { + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " + "ERROR: CIAO context seems to be NIL\n")); + } + } + catch (const ::CORBA::BAD_INV_ORDER &) + { + ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::test_exception - " + "Expected BAD_INV_ORDER thrown.\n")); + } + catch (const CORBA::Exception &e) + { + e._tao_print_exception("RG_ResetTopic_Receiver_impl::test_exception - " + "ERROR: Unexpected exception"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - " + "ERROR: expected and unknown exception caught\n")); + } + } + + void + RG_ResetTopic_Receiver_impl::start_reading (void) + { + ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_reading - " + "Start reading\n")); + ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = + this->ciao_context_->get_connection_info_read_data (); + try + { + RG_ResetTopicSampleSeq samples; + ::CCM_DDS::ReadInfoSeq readinfo_seq; + reader->read_all (samples, readinfo_seq); + + this->check_samples ("read", samples, this->expected_per_run_); + } + catch (const CORBA::Exception &e) + { + e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_reading - " + "ERROR: Unexpected exception"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_reading - " + "ERROR: Caught unknow exception\n")); + } + } + + void + RG_ResetTopic_Receiver_impl::start_getting (void) + { + try + { + ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter = + this->ciao_context_->get_connection_info_get_fresh_data (); + if (::CORBA::is_nil (getter.in ())) + { + ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_getting - " + "ERROR: Unable to get writer interface from the " + "CIAO context\n")); + return; + } + DDS::Duration_t to; + to.sec = 1; + to.nanosec = 0; + getter->time_out (to); + + RG_ResetTopicSampleSeq samples; + ::CCM_DDS::ReadInfoSeq readinfos; + getter->get_many (samples, readinfos); + this->check_samples ("get", samples); + } + catch (const CORBA::Exception &e) + { + e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_getting - " + "ERROR: Unexpected exception"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_getting - " + "ERROR: expected and unknown exception caught\n")); + } + } + + void + RG_ResetTopic_Receiver_impl::set_topic_name_reader (const char * topic_name) + { + try + { + ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_reader - " + "Setting topic name to <%C>\n", topic_name)); + ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader = + this->ciao_context_->get_connection_info_read_data (); + if (::CORBA::is_nil (reader.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " + "Unable to get reader interface\n")); + throw ::CORBA::INTERNAL (); + } + ::CORBA::Object_var cmp = reader->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State_var conn = + ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + + conn->topic_name (topic_name); + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - " + "Caught NonChangeable exception.\n")); + } + } + + void + RG_ResetTopic_Receiver_impl::set_topic_name_getter (const char * topic_name) + { + try + { + ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - " + "Setting topic name to <%C>\n", topic_name)); + ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter = + this->ciao_context_->get_connection_info_get_fresh_data (); + if (::CORBA::is_nil (getter.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - " + "Unable to get getter interface\n")); + throw ::CORBA::INTERNAL (); + } + ::CORBA::Object_var cmp = getter->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn = + ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + conn->topic_name (topic_name); + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - " + "ERROR: Caught NonChangeable exception.\n")); + } + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h new file mode 100644 index 00000000000..241ab592731 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h @@ -0,0 +1,77 @@ +// $Id$ + +#ifndef RG_RESETTOPIC_RECEIVER_IMPL_H_ +#define RG_RESETTOPIC_RECEIVER_IMPL_H_ + +#include "RG_ResetTopic_ReceiverEC.h" + +namespace CIAO_RG_ResetTopic_Receiver_Impl +{ + class RG_ResetTopic_Receiver_impl; + + /** + * LastSampleChecker + */ + class LastSampleChecker + : public ACE_Event_Handler + { + public: + LastSampleChecker (RG_ResetTopic_Receiver_impl &callback, + const ::CORBA::UShort &iterations); + + virtual ~LastSampleChecker (void); + + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + RG_ResetTopic_Receiver_impl &callback_; + const ::CORBA::UShort iterations_; + }; + + /** + * RG_ResetTopic_Receiver_impl + */ + class RG_ResetTopic_Receiver_impl + { + public: + RG_ResetTopic_Receiver_impl ( + ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx, + const ::CORBA::UShort & iterations, + const ::CORBA::UShort & keys); + ~RG_ResetTopic_Receiver_impl (void); + + void start (const char * topic_name); + bool check_last (void); + void start_read (void); + + + void iterations (::CORBA::UShort iterations); + void keys (::CORBA::UShort keys); + + private: + ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_; + ::CORBA::UShort iterations_; + ::CORBA::UShort keys_; + ::CORBA::UShort expected_per_run_; + + LastSampleChecker * checker_; + + ACE_CString topic_name_; + + void set_topic_name_reader (const char * topic_name); + void set_topic_name_getter (const char * topic_name); + + void start_reading (void); + void start_getting (void); + void test_exception (void); + + void check_samples ( + const char * test, + const RG_ResetTopicSampleSeq& samples, + const ::CORBA::UShort& expected=0); + + ACE_Reactor* reactor (void); + }; +}; + +#endif /* RG_RESETTOPIC_RECEIVER_IMPL_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl new file mode 100644 index 00000000000..218682613f5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl @@ -0,0 +1,29 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + * + * by-hand idl3 translation of sender components. + */ + +#ifndef RG_RESETTOPIC_SENDER_IDL +#define RG_RESETTOPIC_SENDER_IDL + +#include "Connector/RG_ResetTopic_Connector.idl" +#include "Base/Reader_Starter.idl" + +module RG_ResetTopic +{ + component Sender + { + port RG_ResetTopicSampleConnector::DDS_Write info_write; + + attribute unsigned short iterations; + attribute unsigned short keys; + + uses ReaderStarter reader_start; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc new file mode 100644 index 00000000000..b2ee15acdb8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc @@ -0,0 +1,152 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" + +project (RG_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { + after += RG_ResetTopicConnector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + -Wb,stub_export_include=Sender_stub_export.h \ + -Wb,skel_export_macro=SENDER_SVNT_Export \ + -Wb,skel_export_include=Sender_svnt_export.h \ + -Wb,svnt_export_macro=SENDER_SVNT_Export \ + -Wb,svnt_export_include=Sender_svnt_export.h \ + -Wb,exec_export_macro=SENDER_EXEC_Export \ + -Wb,exec_export_include=Sender_exec_export.h \ + -I .. + + IDL_Files { + RG_ResetTopic_Sender.idl + } +} + +project (RG_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { + after += RG_ResetTopicSender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=Sender_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors -I .. + + IDL_Files { + RG_ResetTopic_SenderE.idl + } +} + +project (RG_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { + after += RG_ResetTopicSender_lem_gen RG_ResetTopicSender_stub \ + RG_ResetTopicBase_stub reader_starter_rt_stub + libs += RG_ResetTopicBase_stub Sender_stub reader_starter_rt_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Sender_lem_stub + dynamicflags += SENDER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_SenderEC.cpp + } + + Header_Files { + RG_ResetTopic_SenderEC.h + Sender_lem_stub_export.h + } + + Inline_Files { + RG_ResetTopic_SenderEC.inl + } +} + +project (RG_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { + after += RG_ResetTopicSender_idl_gen RG_ResetTopicBase_stub \ + RG_ResetTopicConnector_stub reader_starter_rt_stub \ + reader_starter_rt_lem_stub + libs += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \ + reader_starter_rt_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sender_stub + dynamicflags += SENDER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_SenderC.cpp + } + + Header_Files { + RG_ResetTopic_SenderC.h + Sender_stub_export.h + } + + Inline_Files { + RG_ResetTopic_SenderC.inl + } +} + +project (RG_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { + after += RG_ResetTopicSender_lem_stub RG_ResetTopicSender_stub \ + RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \ + reader_starter_rt_svnt reader_starter_rt_lem_stub + sharedname = Sender_exec + libs += Sender_stub Sender_lem_stub RG_ResetTopicBase_stub \ + RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \ + reader_starter_rt_stub reader_starter_rt_svnt reader_starter_rt_lem_stub + libpaths += ../lib + includes += .. + libout = ../lib + dynamicflags += SENDER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_Sender_exec.cpp + } + + Header_Files { + RG_ResetTopic_Sender_exec.h + Sender_exec_export.h + } + + Inline_Files { + } +} + + +project (RG_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += RG_ResetTopicBase_stub RG_ResetTopicSender_lem_stub RG_ResetTopicConnector_stub \ + RG_ResetTopicConnector_svnt RG_ResetTopicConnector_lem_stub \ + reader_starter_rt_stub reader_starter_rt_lem_stub reader_starter_rt_svnt + sharedname = Sender_svnt + libs += Sender_stub Sender_lem_stub \ + RG_ResetTopicBase_stub RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \ + RG_ResetTopicConnector_lem_stub reader_starter_rt_stub \ + reader_starter_rt_lem_stub reader_starter_rt_svnt + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += SENDER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + RG_ResetTopic_SenderS.cpp + RG_ResetTopic_Sender_svnt.cpp + } + + Header_Files { + RG_ResetTopic_SenderS.h + RG_ResetTopic_Sender_svnt.h + Sender_svnt_export.h + } + + Inline_Files { + RG_ResetTopic_SenderS.inl + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp new file mode 100644 index 00000000000..1fa28b59098 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp @@ -0,0 +1,257 @@ +// -*- C++ -*- +// $Id$ + +#include "RG_ResetTopic_Sender_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +#define TOPIC_1 "ResetTopic1" +#define TOPIC_2 "ResetTopic2" + + +namespace CIAO_RG_ResetTopic_Sender_Impl +{ + + /** + * Timeout_Handler + */ + + Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) + : callback_ (callback) + { + } + + int + Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) + { + this->callback_.start_write (); + return 0; + } + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + Sender_exec_i::Sender_exec_i (void) + : iterations_ (0) + , keys_ (0) + , topic_name_ (TOPIC_2) + , run_(0) + , start_key_ (1) + , start_iteration_ (1) + { + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + // Supported operations and attributes. + ACE_Reactor* + Sender_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void + Sender_exec_i::start_write (void) + { + try + { + if (++this->run_ > 4) + return; + if (ACE_OS::strcmp (this->topic_name_.c_str(), TOPIC_1) == 0) + this->topic_name_ = TOPIC_2; + else + this->topic_name_ = TOPIC_1; + + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_write - " + "Setting topic name to <%C>\n", this->topic_name_.c_str())); + + ::RG_ResetTopic::RG_ResetTopicSampleConnector::Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (::CORBA::is_nil (writer.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - " + "Unable to get writer interface\n")); + throw ::CORBA::INTERNAL (); + } + ::CORBA::Object_var cmp = writer->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn = + ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + + conn->topic_name (::CORBA::string_dup (this->topic_name_.c_str())); + + ::CORBA::UShort key = 0; + ::CORBA::UShort iter = 0; + for (key = this->start_key_; key < this->run_ * this->keys_ + 1; ++key) + { + RG_ResetTopicSample sample; + char tmp[7]; + ACE_OS::sprintf (tmp, "KEY_%d", key); + sample.key = CORBA::string_dup(tmp); + + for (iter = this->start_iteration_; iter < this->run_ * this->iterations_ + 1; ++iter) + { + sample.iteration = iter; + writer->write_one (sample, ::DDS::HANDLE_NIL); + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " + "Sample written : key <%C> - iteration <%d>\n", + tmp, iter)); + } + } + this->start_key_ = key; + this->start_iteration_ = iter; + ACE_Time_Value tv (2, 0); + ACE_OS::sleep (tv); + ReaderStarter_var starter = + this->ciao_context_->get_connection_reader_start (); + if (!::CORBA::is_nil (starter.in ())) + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " + "Inform the receiver that all samples were written\n")); + starter->set_reader_properties (this->start_key_ - 1, this->start_iteration_ - 1); + + starter->start_read (::CORBA::string_dup(this->topic_name_.c_str())); + } + else + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " + "ERROR: unable to get connection to the ReaderStarter\n")); + } + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " + "ERROR: Caught NonChangeable exception.\n")); + } + catch (const ::CORBA::Exception & e) + { + e._tao_print_exception("Sender_exec_i::start_event_test - ERROR"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " + "ERROR: Unexpected and unknown exception caught.\n")); + } + } + + + // Component attributes and port operations. + + ::CORBA::UShort + Sender_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Sender_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + ::CORBA::UShort + Sender_exec_i::keys (void) + { + return this->keys_; + } + + void + Sender_exec_i::keys ( + const ::CORBA::UShort keys) + { + this->keys_ = keys; + } + + // Operations from Components::SessionComponent. + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::RG_ResetTopic::CCM_Sender_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Sender_exec_i::ccm_activate (void) + { + ACE_NEW_THROW_EX (this->to_handler_, + Timeout_Handler (*this), + ::CORBA::INTERNAL ()); + if (this->reactor ()->schedule_timer ( + this->to_handler_, + 0, + ACE_Time_Value (1, 0), + ACE_Time_Value (10, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling timer"))); + } + } + + void + Sender_exec_i::ccm_passivate (void) + { + this->reactor()->cancel_timer(this->to_handler_); + } + + void + Sender_exec_i::ccm_remove (void) + { + delete this->to_handler_; + } + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_RG_ResetTopic_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h new file mode 100644 index 00000000000..66c55bfa8d9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h @@ -0,0 +1,139 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ +#define CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ + +#include /**/ "ace/pre.h" + +#include "RG_ResetTopic_SenderEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Sender_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIAO_RG_ResetTopic_Sender_Impl +{ + class Sender_exec_i; + + /** + * Timeout_Handler + */ + class Timeout_Handler : + public ACE_Event_Handler + { + public: + Timeout_Handler (Sender_exec_i &callback); + /// Handle the timeout. + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + /// Maintains a handle that actually process the event + Sender_exec_i &callback_; + }; + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::CORBA::UShort iterations (void); + + virtual void iterations (::CORBA::UShort iterations); + + virtual ::CORBA::UShort keys (void); + + virtual void keys (::CORBA::UShort keys); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void start_write (void); + //@} + + private: + ::RG_ResetTopic::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + + ::CORBA::UShort iterations_; + + ::CORBA::UShort keys_; + //@} + + //@{ + /** User defined members. */ + Timeout_Handler *to_handler_; + ACE_CString topic_name_; + ::CORBA::UShort run_; + ::CORBA::UShort start_key_; + ::CORBA::UShort start_iteration_; + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_RG_ResetTopic_Sender_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp new file mode 100644 index 00000000000..b47fe050e3c --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp @@ -0,0 +1,461 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>ResetTopic_Depl_1</label> + <UUID>ResetTopic_Depl_1</UUID> + + <implementation xmi:id="ReceiverComponentImplementation"> + <name>ReceiverComponentImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ResetTopic_EventConnectorImplementation"> + <name>ResetTopic_EventConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>RG_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>RG_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ResetTopic_StateConnectorImplementation"> + <name>ResetTopic_StateConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>RG_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>RG_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SenderComponentImplementation"> + <name>SenderComponentImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_RG_ResetTopic_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="ReceiverComponentInstance"> + <name>ReceiverComponent</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="ReceiverComponentImplementation" /> + </instance> + + <instance xmi:id="ResetTopic_SenderEventConnectorInstance"> + <name>ResetTopic_SenderEventConnectorInstance</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="ResetTopic_EventConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ResetTopic1</string> + </value> + </value> + </configProperty> + <configProperty> + <name>qos_profile</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ResetTopic_Library#ResetTopic_Profile</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_ReceiverEventConnectorInstance"> + <name>ResetTopic_ReceiverEventConnectorInstance</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="ResetTopic_EventConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string></string> + </value> + </value> + </configProperty> + <configProperty> + <name>qos_profile</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ResetTopic_Library#ResetTopic_Profile</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_ReceiverStateConnectorInstance"> + <name>ResetTopic_ReceiverStateConnectorInstance</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="ResetTopic_StateConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string></string> + </value> + </value> + </configProperty> + <configProperty> + <name>qos_profile</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ResetTopic_Library#ResetTopic_Profile</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderComponentInstance"> + <name>SenderComponent</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="SenderComponentImplementation" /> + <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>5</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>iterations</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>10</ushort> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>reader_starter</name> + <internalEndpoint> + <portName>reader_start</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>start_reading</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>reader_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_read_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>passive_observer_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>getter_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_get_fresh_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>pull_consumer_fresh_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>writer_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_write_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>supplier_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + <artifact xmi:id="Sender_StubArtifact"> + <name>Sender_stub</name> + <source/> + <node/> + <location>Sender_stub</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_ExecArtifact"> + <name>RG_ResetTopic_Connector_exec</name> + <source/> + <node/> + <location>RG_ResetTopicConnector_exec</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_SvntArtifact"> + <name>RG_ResetTopic_Connector_svnt</name> + <source/> + <node/> + <location>RG_ResetTopicConnector_svnt</location> + </artifact> + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + <artifact xmi:id="Receiver_StubArtifact"> + <name>Receiver_stub</name> + <source/> + <node/> + <location>Receiver_stub</location> + </artifact> +</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml new file mode 100644 index 00000000000..16feefbe312 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- $Id$ --> +<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> + <qos_library name="ResetTopic_Library"> + <qos_profile name="ResetTopic_Profile" is_default_qos="true"> + <datawriter_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + <max_blocking_time> + <sec>10</sec> + <nanosec>0</nanosec> + </max_blocking_time> + </reliability> + <durability> + <kind>TRANSIENT_DURABILITY_QOS</kind> + </durability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <protocol> + <rtps_reliable_writer> + <max_heartbeat_retries>10</max_heartbeat_retries> + </rtps_reliable_writer> + </protocol> + </datawriter_qos> + <datareader_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + </reliability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <durability> + <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind> + </durability> + </datareader_qos> + </qos_profile> + </qos_library> +</dds> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl new file mode 100755 index 00000000000..5eb32d70c34 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl @@ -0,0 +1,244 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 2; +@ports = ( 60001, 60002 ); +@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); +@iorfiles = 0; +@nodenames = ( "SenderNode", "ReceiverNode" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 60 seconds to allow task to complete\n"; +sleep (60); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl new file mode 100644 index 00000000000..755bf2051d5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl @@ -0,0 +1,24 @@ +// $Id$ + +/** + * @file TE_ResetTopic_Base.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef TE_RESETTOPIC_BASE_IDL +#define TE_RESETTOPIC_BASE_IDL + +#pragma ndds typesupport "Base/TE_ResetTopic_BaseSupport.h" +#pragma opendds typesupport "Base/TE_ResetTopic_BaseTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "TE_ResetTopicTest" +#pragma DCPS_DATA_KEY "TE_ResetTopicTest key" + +struct TE_ResetTopicTest { + string key; //@key + long iteration; +}; + +typedef sequence<TE_ResetTopicTest> TE_ResetTopicTestSeq; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc new file mode 100644 index 00000000000..e167c1d0daa --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (TE_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname = TE_ResetTopicBase_stub + dynamicflags += TE_RESETTOPIC_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=TE_RESETTOPIC_BASE_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + TE_ResetTopic_Base.idl + } + + opendds_ts_flags += --export=TE_RESETTOPIC_BASE_STUB_Export + + DDSGenerator_Files { + TE_ResetTopic_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl new file mode 100644 index 00000000000..7fa6bd3d791 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl @@ -0,0 +1,23 @@ +// $Id$ + +/** + * @file TE_ResetTopic_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef TE_RESETTOPIC_CONNECTOR_IDL_ +#define TE_RESETTOPIC_CONNECTOR_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/TE_ResetTopic_Base.idl" + +#pragma ciao lem "Connector/TE_ResetTopic_ConnectorE.idl" + +module TE_ResetTopic +{ + module ::CCM_DDS::Typed < ::TE_ResetTopicTest, ::TE_ResetTopicTestSeq> TE_ResetTopicTestConnector; +}; + +#endif /* TE_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc new file mode 100644 index 00000000000..dd159226915 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc @@ -0,0 +1,148 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l .. -o ../lib -u DDS TE_ResetTopic_Connector" + +project (TE_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ + -Wb,skel_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,svnt_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,conn_export_macro=TE_RESETTOPIC_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ + -I .. + + IDL_Files { + TE_ResetTopic_Connector.idl + } +} + +project (TE_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += TE_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=TE_ResetTopic_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + TE_ResetTopic_ConnectorE.idl + } +} + +project (TE_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += TE_ResetTopicConnector_lem_gen TE_ResetTopicConnector_stub \ + TE_ResetTopicBase_stub + libs += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = TE_ResetTopicConnector_lem_stub + dynamicflags += TE_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_ConnectorEC.cpp + } + + Header_Files { + TE_ResetTopic_ConnectorEC.h + TE_ResetTopic_Connector_lem_stub_export.h + } + + Inline_Files { + TE_ResetTopic_ConnectorEC.inl + } +} + +project (TE_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { + after += TE_ResetTopicConnector_idl_gen TE_ResetTopicBase_stub + libs += TE_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = TE_ResetTopicConnector_stub + dynamicflags += TE_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_ConnectorC.cpp + } + + Header_Files { + TE_ResetTopic_ConnectorC.h + TE_ResetTopic_Connector_stub_export.h + } + + Inline_Files { + TE_ResetTopic_ConnectorC.inl + } +} + +project (TE_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { + after += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub \ + TE_ResetTopicBase_stub + sharedname = TE_ResetTopicConnector_exec + libs += TE_ResetTopicConnector_stub TE_ResetTopicConnector_lem_stub \ + TE_ResetTopicBase_stub TE_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += TE_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_Connector_conn.cpp + } + + Header_Files { + TE_ResetTopic_Connector_conn.h + TE_ResetTopic_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project (TE_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { + after += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_exec \ + TE_ResetTopicConnector_stub + sharedname = TE_ResetTopicConnector_svnt + libs += TE_ResetTopicConnector_stub \ + TE_ResetTopicConnector_lem_stub \ + TE_ResetTopicBase_stub \ + TE_ResetTopicConnector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += TE_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_ConnectorS.cpp + TE_ResetTopic_Connector_svnt.cpp + } + + Header_Files { + TE_ResetTopic_ConnectorS.h + TE_ResetTopic_Connector_svnt.h + TE_ResetTopic_Connector_svnt_export.h + } + + Inline_Files { + TE_ResetTopic_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp new file mode 100644 index 00000000000..56ac8f1daa2 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp @@ -0,0 +1,93 @@ +//$Id$ +/* + * @file SenderDriver.cpp + * + * @author Marcel Smit + */ + + +#include "TE_ResetTopic_SenderC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); +const ACE_TCHAR *topic_name = ACE_TEXT (""); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + sender_ior = get_opts.opt_arg (); + break; + + case 'n': + topic_name = get_opts.opt_arg (); + break; + + case 'e': + topic_name = ""; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Sender IOR> (default is file://Sender.ior)\n" + "-n <new topic>\n" + "-e <clearing topic name>\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var sender_obj = + orb->string_to_object (sender_ior); + + // downcast the object reference to the appropriate type + ::TE_ResetTopic::Sender_var sender = + ::TE_ResetTopic::Sender::_narrow (sender_obj.in ()); + + if (CORBA::is_nil (sender.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to acquire 'Sender' objref\n"), + -1); + } + sender->set_new_topic (topic_name); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl new file mode 100644 index 00000000000..9712f2257bc --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl @@ -0,0 +1,32 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + * + * by-hand idl3 translation of sender components. + */ + +#ifndef TE_RESETTOPIC_SENDER_IDL +#define TE_RESETTOPIC_SENDER_IDL + +#include "Connector/TE_ResetTopic_Connector.idl" + +module TE_ResetTopic +{ + interface ChangeTopicInterface + { + void set_new_topic (in string topic_name); + }; + + component Sender supports ChangeTopicInterface + { + port TE_ResetTopicTestConnector::DDS_Write info_write; + port TE_ResetTopicTestConnector::DDS_Update info_update; + + attribute unsigned short iterations; + attribute unsigned short keys; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc new file mode 100644 index 00000000000..396ab0c1405 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc @@ -0,0 +1,166 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" + +project (TE_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { + after += TE_ResetTopicConnector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + -Wb,stub_export_include=Sender_stub_export.h \ + -Wb,skel_export_macro=SENDER_SVNT_Export \ + -Wb,skel_export_include=Sender_svnt_export.h \ + -Wb,svnt_export_macro=SENDER_SVNT_Export \ + -Wb,svnt_export_include=Sender_svnt_export.h \ + -Wb,exec_export_macro=SENDER_EXEC_Export \ + -Wb,exec_export_include=Sender_exec_export.h \ + -I .. + + IDL_Files { + TE_ResetTopic_Sender.idl + } +} + +project (TE_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { + after += TE_ResetTopicSender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=Sender_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors -I .. + + IDL_Files { + TE_ResetTopic_SenderE.idl + } +} + +project (TE_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { + after += TE_ResetTopicSender_lem_gen TE_ResetTopicSender_stub TE_ResetTopicBase_stub + libs += TE_ResetTopicBase_stub Sender_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Sender_lem_stub + dynamicflags += SENDER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_SenderEC.cpp + } + + Header_Files { + TE_ResetTopic_SenderEC.h + Sender_lem_stub_export.h + } + + Inline_Files { + TE_ResetTopic_SenderEC.inl + } +} + +project (TE_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { + after += TE_ResetTopicSender_idl_gen TE_ResetTopicBase_stub TE_ResetTopicConnector_stub + libs += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sender_stub + dynamicflags += SENDER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_SenderC.cpp + } + + Header_Files { + TE_ResetTopic_SenderC.h + Sender_stub_export.h + } + + Inline_Files { + TE_ResetTopic_SenderC.inl + } +} + +project (TE_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { + after += TE_ResetTopicSender_lem_stub TE_ResetTopicSender_stub \ + TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub + sharedname = Sender_exec + libs += Sender_stub Sender_lem_stub TE_ResetTopicBase_stub \ + TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub + libpaths += ../lib + includes += .. + libout = ../lib + dynamicflags += SENDER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_Sender_exec.cpp + } + + Header_Files { + TE_ResetTopic_Sender_exec.h + Sender_exec_export.h + } + + Inline_Files { + } +} + + +project (TE_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += TE_ResetTopicBase_stub TE_ResetTopicSender_lem_stub TE_ResetTopicConnector_stub \ + TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub + sharedname = Sender_svnt + libs += Sender_stub Sender_lem_stub \ + TE_ResetTopicBase_stub TE_ResetTopicConnector_stub TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += SENDER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TE_ResetTopic_SenderS.cpp + TE_ResetTopic_Sender_svnt.cpp + } + + Header_Files { + TE_ResetTopic_SenderS.h + TE_ResetTopic_Sender_svnt.h + Sender_svnt_export.h + } + + Inline_Files { + TE_ResetTopic_SenderS.inl + } +} + +project (TE_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { + exename = SenderDriver + after += TE_ResetTopicSender_stub TE_ResetTopicConnector_stub + libs += Sender_stub TE_ResetTopicBase_stub TE_ResetTopicConnector_stub + + includes += .. + libpaths += ../lib + + exeout = ../lib + IDL_Files { + } + + Source_Files { + SenderDriver.cpp + } + + Header_Files { + } + + Inline_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp new file mode 100644 index 00000000000..c9d10361d79 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp @@ -0,0 +1,387 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "TE_ResetTopic_Sender_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_TE_ResetTopic_Sender_Impl +{ + + /** + * Timeout_Handler + */ + + Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) + : callback_ (callback) + { + } + + int + Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.start_event_test (); + return 0; + } + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + Sender_exec_i::Sender_exec_i (void) + : iterations_ (0) + , keys_ (0) + , to_handler_ (0) + , topic_name_ ("TopicI") + , old_topic_name_ ("TopicI") + { + ACE_NEW_THROW_EX (this->to_handler_, + Timeout_Handler (*this), + ::CORBA::INTERNAL ()); + } + + Sender_exec_i::~Sender_exec_i (void) + { + delete this->to_handler_; + } + + // Supported operations and attributes. + ACE_Reactor* + Sender_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void Sender_exec_i::set_new_topic (const char * topic_name) + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + + this->old_topic_name_ = this->topic_name_; + this->topic_name_ = topic_name; + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " + "New topic name set <%C>\n", + topic_name)); + } + + void + Sender_exec_i::create_samples (void) + { + for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) + { + char key[7]; + TE_ResetTopicTest *new_key = new TE_ResetTopicTest; + ACE_OS::sprintf (key, "KEY_%d", i); + new_key->key = CORBA::string_dup(key); + new_key->iteration = 0; + this->tests_[key] = new_key; + + ::TE_ResetTopic::TE_ResetTopicTestConnector::Updater_var updater = + this->ciao_context_->get_connection_info_update_data(); + + updater->create_one (*new_key); + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - " + "Sample <%C> created\n", + key)); + } + } + + void + Sender_exec_i::set_topic_name (const char * topic_name) + { + if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) + { + this->old_topic_name_ = topic_name; + this->set_topic_name_writer (topic_name); + this->set_topic_name_updater (topic_name); + } + } + + void + Sender_exec_i::set_topic_name_writer (const char * topic_name) + { + try + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " + "Setting topic to <%C>\n", + topic_name)); + ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (::CORBA::is_nil (writer.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to get writer interface\n")); + throw ::CORBA::INTERNAL (); + } + ::CORBA::Object_var cmp = writer->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event_var conn = + ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + conn->topic_name (topic_name); + } + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + } + } + + void + Sender_exec_i::set_topic_name_updater (const char * topic_name) + { + try + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " + "Setting topic to <%C>\n", + topic_name)); + ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater = + this->ciao_context_->get_connection_info_update_data (); + if (::CORBA::is_nil (updater.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to get updater interface\n")); + throw ::CORBA::INTERNAL (); + } + ::CORBA::Object_var cmp = updater->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State_var conn = + ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + conn->topic_name (topic_name); + } + this->create_samples (); + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Caught NonChangeable exception.\n")); + } + } + + void + Sender_exec_i::start_event_test (void) + { + // Set the topic name on the connector first. Therefor we need to + // get to the connector first. + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); + + try + { + for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) + { + TE_ResetTopicTest sample; + char tmp[7]; + ACE_OS::sprintf (tmp, "KEY_%d", key); + sample.key = CORBA::string_dup(tmp); + + for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) + { + this->set_topic_name (this->topic_name_.c_str ()); + ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + sample.iteration = iter; + writer->write_one (sample, ::DDS::HANDLE_NIL); + + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " + "Sample for topic <%C> written : key <%C> - iteration <%d>\n", + this->topic_name_.c_str (), tmp, iter)); + + ACE_Time_Value tv (0, 5000); + ACE_OS::sleep (tv); + } + } + for (Sample_Table::iterator iter = this->tests_.begin (); + iter != this->tests_.end (); + ++iter) + { + for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i) + { + this->set_topic_name (this->topic_name_.c_str ()); + ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater = + this->ciao_context_->get_connection_info_update_data (); + iter->second->iteration = i; + updater->update_one (iter->second, ::DDS::HANDLE_NIL); + + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " + "Sample for topic <%C> updated : key <%C> - iteration <%d>\n", + this->topic_name_.c_str (), + iter->second->key.in (), + i)); + + ACE_Time_Value tv (0, 5000); + ACE_OS::sleep (tv); + } + } + } + catch (const ::CORBA::BAD_INV_ORDER & ex) + { + if (this->topic_name_.empty()) + ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n")); + else + ex._tao_print_exception("ERROR:"); + } + catch (const ::CORBA::Exception & ex) + { + ex._tao_print_exception("ERROR:"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " + "ERROR: Unexpected and unknown exception caught.\n")); + } + } + + // Component attributes and port operations. + + ::CORBA::UShort + Sender_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Sender_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + ::CORBA::UShort + Sender_exec_i::keys (void) + { + return this->keys_; + } + + void + Sender_exec_i::keys ( + const ::CORBA::UShort keys) + { + this->keys_ = keys; + } + + // Operations from Components::SessionComponent. + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::TE_ResetTopic::CCM_Sender_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Sender_exec_i::ccm_activate (void) + { + this->create_samples (); + if (this->reactor ()->schedule_timer ( + this->to_handler_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (5, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling timer"))); + } + } + + void + Sender_exec_i::ccm_passivate (void) + { + this->reactor()->cancel_timer(this->to_handler_); + } + + void + Sender_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_TE_ResetTopic_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h new file mode 100644 index 00000000000..a60008c4a77 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h @@ -0,0 +1,147 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ +#define CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ + +#include /**/ "ace/pre.h" + +#include "TE_ResetTopic_SenderEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Sender_exec_export.h" +#include "tao/LocalObject.h" + +#include <map> + +namespace CIAO_TE_ResetTopic_Sender_Impl +{ + class Sender_exec_i; + + /** + * Timeout_Handler + */ + class Timeout_Handler : + public ACE_Event_Handler + { + public: + Timeout_Handler (Sender_exec_i &callback); + /// Handle the timeout. + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + /// Maintains a handle that actually process the event + Sender_exec_i &callback_; + }; + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + virtual void set_new_topic (const char * topic_name); + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::CORBA::UShort iterations (void); + + virtual void iterations (::CORBA::UShort iterations); + + virtual ::CORBA::UShort keys (void); + + virtual void keys (::CORBA::UShort keys); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void set_topic_name (const char * topic_name); + void set_topic_name_writer (const char * topic_name); + void set_topic_name_updater (const char * topic_name); + void start_event_test (void); + //@} + + private: + ::TE_ResetTopic::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + + ::CORBA::UShort iterations_; + + ::CORBA::UShort keys_; + //@} + + //@{ + /** User defined members. */ + Timeout_Handler *to_handler_; + ACE_CString topic_name_, old_topic_name_; + + TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; + + typedef std::map<ACE_CString, TE_ResetTopicTest_var> Sample_Table; + + Sample_Table tests_; + //@} + + //@{ + /** User defined private operations. */ + void create_samples (void); + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_TE_ResetTopic_Sender_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp new file mode 100644 index 00000000000..9af446d47d0 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp @@ -0,0 +1,338 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>ResetTopic_Depl_1</label> + <UUID>ResetTopic_Depl_1</UUID> + + <implementation xmi:id="ResetTopic_EventConnectorImplementation"> + <name>ResetTopic_EventConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TE_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TE_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ResetTopic_StateConnectorImplementation"> + <name>ResetTopic_StateConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TE_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TE_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SenderComponentImplementation"> + <name>SenderComponentImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TE_ResetTopic_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TE_ResetTopic_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="ResetTopic_SenderEventConnectorInstance"> + <name>ResetTopic_SenderEventConnectorInstance</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="ResetTopic_EventConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_SenderStateConnectorInstance"> + <name>ResetTopic_SenderStateConnectorInstance</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="ResetTopic_StateConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderComponentInstance"> + <name>SenderComponent</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="SenderComponentImplementation" /> + <configProperty> + <name>rate</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>15</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>5</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>iterations</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>10</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>writer_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_write_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>supplier_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>updater_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_update_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>observable_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + <artifact xmi:id="Sender_StubArtifact"> + <name>Sender_stub</name> + <source/> + <node/> + <location>Sender_stub</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_ExecArtifact"> + <name>TE_ResetTopic_Connector_exec</name> + <source/> + <node/> + <location>TE_ResetTopicConnector_exec</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_SvntArtifact"> + <name>TE_ResetTopic_Connector_svnt</name> + <source/> + <node/> + <location>TE_ResetTopicConnector_svnt</location> + </artifact> + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + <artifact xmi:id="Receiver_StubArtifact"> + <name>Receiver_stub</name> + <source/> + <node/> + <location>Receiver_stub</location> + </artifact> +</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl new file mode 100755 index 00000000000..ca093570857 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl @@ -0,0 +1,265 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60001 ); +@iorbases = ( "SenderNode.ior" ); +@iorfiles = 0; +@nodenames = ( "SenderNode" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 10 seconds before clearing the topic name\n"; +sleep (10); + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before setting the topic name again\n"; +sleep (10); + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before stopping\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl new file mode 100644 index 00000000000..761ab9e4ee3 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl @@ -0,0 +1,24 @@ +// $Id$ + +/** + * @file TL_ResetTopic_Base.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef TL_RESETTOPIC_BASE_IDL +#define TL_RESETTOPIC_BASE_IDL + +#pragma ndds typesupport "Base/TL_ResetTopic_BaseSupport.h" +#pragma opendds typesupport "Base/TL_ResetTopic_BaseTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "TL_ResetTopicTest" +#pragma DCPS_DATA_KEY "TL_ResetTopicTest key" + +struct TL_ResetTopicTest { + string key; //@key + long iteration; +}; + +typedef sequence<TL_ResetTopicTest> TL_ResetTopicTestSeq; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc new file mode 100644 index 00000000000..0ea8e8c66bb --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (TL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname = TL_ResetTopicBase_stub + dynamicflags += TL_RESETTOPIC_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=TL_RESETTOPIC_BASE_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + TL_ResetTopic_Base.idl + } + + opendds_ts_flags += --export=TL_RESETTOPIC_BASE_STUB_Export + + DDSGenerator_Files { + TL_ResetTopic_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl new file mode 100644 index 00000000000..2da5ce49b47 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl @@ -0,0 +1,23 @@ +// $Id$ + +/** + * @file TL_ResetTopic_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef TL_RESETTOPIC_CONNECTOR_IDL_ +#define TL_RESETTOPIC_CONNECTOR_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/TL_ResetTopic_Base.idl" + +#pragma ciao lem "Connector/TL_ResetTopic_ConnectorE.idl" + +module TL_ResetTopic +{ + module ::CCM_DDS::Typed < ::TL_ResetTopicTest, ::TL_ResetTopicTestSeq> TL_ResetTopicTestConnector; +}; + +#endif /* TL_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc new file mode 100644 index 00000000000..b65dca4b5b5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc @@ -0,0 +1,148 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l .. -o ../lib -u DDS TL_ResetTopic_Connector" + +project (TL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ + -Wb,skel_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,svnt_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,conn_export_macro=TL_RESETTOPIC_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ + -I .. + + IDL_Files { + TL_ResetTopic_Connector.idl + } +} + +project (TL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += TL_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=TL_ResetTopic_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + TL_ResetTopic_ConnectorE.idl + } +} + +project (TL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += TL_ResetTopicConnector_lem_gen TL_ResetTopicConnector_stub \ + TL_ResetTopicBase_stub + libs += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = TL_ResetTopicConnector_lem_stub + dynamicflags += TL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_ConnectorEC.cpp + } + + Header_Files { + TL_ResetTopic_ConnectorEC.h + TL_ResetTopic_Connector_lem_stub_export.h + } + + Inline_Files { + TL_ResetTopic_ConnectorEC.inl + } +} + +project (TL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { + after += TL_ResetTopicConnector_idl_gen TL_ResetTopicBase_stub + libs += TL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = TL_ResetTopicConnector_stub + dynamicflags += TL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_ConnectorC.cpp + } + + Header_Files { + TL_ResetTopic_ConnectorC.h + TL_ResetTopic_Connector_stub_export.h + } + + Inline_Files { + TL_ResetTopic_ConnectorC.inl + } +} + +project (TL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { + after += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub \ + TL_ResetTopicBase_stub + sharedname = TL_ResetTopicConnector_exec + libs += TL_ResetTopicConnector_stub TL_ResetTopicConnector_lem_stub \ + TL_ResetTopicBase_stub TL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += TL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_Connector_conn.cpp + } + + Header_Files { + TL_ResetTopic_Connector_conn.h + TL_ResetTopic_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project (TL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { + after += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_exec \ + TL_ResetTopicConnector_stub + sharedname = TL_ResetTopicConnector_svnt + libs += TL_ResetTopicConnector_stub \ + TL_ResetTopicConnector_lem_stub \ + TL_ResetTopicBase_stub \ + TL_ResetTopicConnector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += TL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_ConnectorS.cpp + TL_ResetTopic_Connector_svnt.cpp + } + + Header_Files { + TL_ResetTopic_ConnectorS.h + TL_ResetTopic_Connector_svnt.h + TL_ResetTopic_Connector_svnt_export.h + } + + Inline_Files { + TL_ResetTopic_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp new file mode 100644 index 00000000000..a89be8e0002 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp @@ -0,0 +1,93 @@ +//$Id$ +/* + * @file SenderDriver.cpp + * + * @author Marcel Smit + */ + + +#include "TL_ResetTopic_SenderC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); +const ACE_TCHAR *topic_name = ACE_TEXT (""); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + sender_ior = get_opts.opt_arg (); + break; + + case 'n': + topic_name = get_opts.opt_arg (); + break; + + case 'e': + topic_name = ""; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Sender IOR> (default is file://Sender.ior)\n" + "-n <new topic>\n" + "-e <clearing topic name>\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var sender_obj = + orb->string_to_object (sender_ior); + + // downcast the object reference to the appropriate type + ::TL_ResetTopic::Sender_var sender = + ::TL_ResetTopic::Sender::_narrow (sender_obj.in ()); + + if (CORBA::is_nil (sender.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to acquire 'Sender' objref\n"), + -1); + } + sender->set_new_topic (topic_name); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl new file mode 100644 index 00000000000..c5e00ade823 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl @@ -0,0 +1,32 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + * + * by-hand idl3 translation of sender components. + */ + +#ifndef TL_RESETTOPIC_SENDER_IDL +#define TL_RESETTOPIC_SENDER_IDL + +#include "Connector/TL_ResetTopic_Connector.idl" + +module TL_ResetTopic +{ + interface ChangeTopicInterface + { + void set_new_topic (in string topic_name); + }; + + component Sender supports ChangeTopicInterface + { + port TL_ResetTopicTestConnector::DDS_Write info_write; + port TL_ResetTopicTestConnector::DDS_Update info_update; + + attribute unsigned short iterations; + attribute unsigned short keys; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc new file mode 100644 index 00000000000..54d6d13d885 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc @@ -0,0 +1,166 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" + +project (TL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { + after += TL_ResetTopicConnector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + -Wb,stub_export_include=Sender_stub_export.h \ + -Wb,skel_export_macro=SENDER_SVNT_Export \ + -Wb,skel_export_include=Sender_svnt_export.h \ + -Wb,svnt_export_macro=SENDER_SVNT_Export \ + -Wb,svnt_export_include=Sender_svnt_export.h \ + -Wb,exec_export_macro=SENDER_EXEC_Export \ + -Wb,exec_export_include=Sender_exec_export.h \ + -I .. + + IDL_Files { + TL_ResetTopic_Sender.idl + } +} + +project (TL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { + after += TL_ResetTopicSender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=Sender_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors -I .. + + IDL_Files { + TL_ResetTopic_SenderE.idl + } +} + +project (TL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { + after += TL_ResetTopicSender_lem_gen TL_ResetTopicSender_stub TL_ResetTopicBase_stub + libs += TL_ResetTopicBase_stub Sender_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Sender_lem_stub + dynamicflags += SENDER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_SenderEC.cpp + } + + Header_Files { + TL_ResetTopic_SenderEC.h + Sender_lem_stub_export.h + } + + Inline_Files { + TL_ResetTopic_SenderEC.inl + } +} + +project (TL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { + after += TL_ResetTopicSender_idl_gen TL_ResetTopicBase_stub TL_ResetTopicConnector_stub + libs += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sender_stub + dynamicflags += SENDER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_SenderC.cpp + } + + Header_Files { + TL_ResetTopic_SenderC.h + Sender_stub_export.h + } + + Inline_Files { + TL_ResetTopic_SenderC.inl + } +} + +project (TL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { + after += TL_ResetTopicSender_lem_stub TL_ResetTopicSender_stub \ + TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub + sharedname = Sender_exec + libs += Sender_stub Sender_lem_stub TL_ResetTopicBase_stub \ + TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub + libpaths += ../lib + includes += .. + libout = ../lib + dynamicflags += SENDER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_Sender_exec.cpp + } + + Header_Files { + TL_ResetTopic_Sender_exec.h + Sender_exec_export.h + } + + Inline_Files { + } +} + + +project (TL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += TL_ResetTopicBase_stub TL_ResetTopicSender_lem_stub TL_ResetTopicConnector_stub \ + TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub + sharedname = Sender_svnt + libs += Sender_stub Sender_lem_stub \ + TL_ResetTopicBase_stub TL_ResetTopicConnector_stub TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += SENDER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + TL_ResetTopic_SenderS.cpp + TL_ResetTopic_Sender_svnt.cpp + } + + Header_Files { + TL_ResetTopic_SenderS.h + TL_ResetTopic_Sender_svnt.h + Sender_svnt_export.h + } + + Inline_Files { + TL_ResetTopic_SenderS.inl + } +} + +project (TL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { + exename = SenderDriver + after += TL_ResetTopicSender_stub TL_ResetTopicConnector_stub + libs += Sender_stub TL_ResetTopicBase_stub TL_ResetTopicConnector_stub + + includes += .. + libpaths += ../lib + + exeout = ../lib + IDL_Files { + } + + Source_Files { + SenderDriver.cpp + } + + Header_Files { + } + + Inline_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp new file mode 100644 index 00000000000..ae6442eda81 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp @@ -0,0 +1,427 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "TL_ResetTopic_Sender_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_TL_ResetTopic_Sender_Impl +{ + + /** + * Timeout_Handler + */ + + Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) + : callback_ (callback) + { + } + + int + Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.start_event_test (); + return 0; + } + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + Sender_exec_i::Sender_exec_i (void) + : iterations_ (0) + , keys_ (0) + , to_handler_ (0) + , topic_name_ ("TopicI") + , old_topic_name_ ("TopicI") + { + ACE_NEW_THROW_EX (this->to_handler_, + Timeout_Handler (*this), + ::CORBA::INTERNAL ()); + } + + Sender_exec_i::~Sender_exec_i (void) + { + delete this->to_handler_; + } + + // Supported operations and attributes. + ACE_Reactor* + Sender_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void Sender_exec_i::set_new_topic (const char * topic_name) + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + + this->old_topic_name_ = this->topic_name_; + this->topic_name_ = topic_name; + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " + "New topic name set <%C>\n", + topic_name)); + } + + void + Sender_exec_i::create_samples (void) + { + for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) + { + char key[7]; + TL_ResetTopicTest *new_key = new TL_ResetTopicTest; + ACE_OS::sprintf (key, "KEY_%d", i); + new_key->key = CORBA::string_dup(key); + new_key->iteration = 0; + this->tests_[key] = new_key; + + ::TL_ResetTopic::TL_ResetTopicTestConnector::Updater_var updater = + this->ciao_context_->get_connection_info_update_data(); + + updater->create_one (*new_key); + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - " + "Sample <%C> created\n", + key)); + } + } + + bool + Sender_exec_i::set_topic_name (const char * topic_name) + { + if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) + { + this->old_topic_name_ = topic_name; + bool ret = this->set_topic_name_writer (topic_name); + ret |= this->set_topic_name_updater (topic_name); + return ret; + } + if (ACE_OS::strlen (this->topic_name_.c_str()) > 256) + return false; + return true; + } + + bool + Sender_exec_i::set_topic_name_writer (const char * topic_name) + { + try + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " + "Setting topic to <%C>\n", + topic_name)); + ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (::CORBA::is_nil (writer.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to get writer interface\n")); + return false; + } + ::CORBA::Object_var cmp = writer->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to get component interface\n")); + return false; + } + ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event_var conn = + ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to narrow connector interface\n")); + return false; + } + { + ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false); + conn->topic_name (topic_name); + } + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + return false; + } + catch (const ::CCM_DDS::InternalError &) + { + if (ACE_OS::strlen (topic_name) > 256) + { + ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_writer - " + "Expected InternalErr exception caught.\n")); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Caught InternalError exception.\n")); + } + return false; + } + return true; + } + + bool + Sender_exec_i::set_topic_name_updater (const char * topic_name) + { + try + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " + "Setting topic to <%C>\n", + topic_name)); + ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater = + this->ciao_context_->get_connection_info_update_data (); + if (::CORBA::is_nil (updater.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to get updater interface\n")); + return false; + } + ::CORBA::Object_var cmp = updater->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to get component interface\n")); + return false; + } + ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State_var conn = + ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to narrow connector interface\n")); + return false; + } + { + ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false); + conn->topic_name (topic_name); + } + this->create_samples (); + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Caught NonChangeable exception.\n")); + return false; + } + catch (const ::CCM_DDS::InternalError &) + { + if (ACE_OS::strlen (topic_name) > 256) + { + ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_updater - " + "Expected InternalErr exception caught.\n")); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Caught InternalError exception.\n")); + } + return false; + } + return true; + } + + void + Sender_exec_i::start_event_test (void) + { + // Set the topic name on the connector first. Therefor we need to + // get to the connector first. + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); + + try + { + for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) + { + TL_ResetTopicTest sample; + char tmp[7]; + ACE_OS::sprintf (tmp, "KEY_%d", key); + sample.key = CORBA::string_dup(tmp); + + for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) + { + if (this->set_topic_name (this->topic_name_.c_str ())) + { + ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + sample.iteration = iter; + writer->write_one (sample, ::DDS::HANDLE_NIL); + + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " + "Sample for topic <%C> written : key <%C> - iteration <%d>\n", + this->topic_name_.c_str (), tmp, iter)); + } + + ACE_Time_Value tv (0, 5000); + ACE_OS::sleep (tv); + } + } + for (Sample_Table::iterator iter = this->tests_.begin (); + iter != this->tests_.end (); + ++iter) + { + for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i) + { + if (this->set_topic_name (this->topic_name_.c_str ())) + { + ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater = + this->ciao_context_->get_connection_info_update_data (); + iter->second->iteration = i; + updater->update_one (iter->second, ::DDS::HANDLE_NIL); + + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " + "Sample for topic <%C> updated : key <%C> - iteration <%d>\n", + this->topic_name_.c_str (), + iter->second->key.in (), + i)); + } + + ACE_Time_Value tv (0, 5000); + ACE_OS::sleep (tv); + } + } + } + catch (const ::CORBA::BAD_INV_ORDER & ex) + { + if (this->topic_name_.empty()) + ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n")); + else + ex._tao_print_exception("ERROR:"); + } + catch (const ::CORBA::Exception & ex) + { + ex._tao_print_exception("ERROR:"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " + "ERROR: Unexpected and unknown exception caught.\n")); + } + } + + // Component attributes and port operations. + + ::CORBA::UShort + Sender_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Sender_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + ::CORBA::UShort + Sender_exec_i::keys (void) + { + return this->keys_; + } + + void + Sender_exec_i::keys ( + const ::CORBA::UShort keys) + { + this->keys_ = keys; + } + + // Operations from Components::SessionComponent. + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::TL_ResetTopic::CCM_Sender_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Sender_exec_i::ccm_activate (void) + { + this->create_samples (); + if (this->reactor ()->schedule_timer ( + this->to_handler_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (5, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling timer"))); + } + } + + void + Sender_exec_i::ccm_passivate (void) + { + this->reactor()->cancel_timer(this->to_handler_); + } + + void + Sender_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_TL_ResetTopic_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h new file mode 100644 index 00000000000..0c550395a3d --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h @@ -0,0 +1,147 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ +#define CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ + +#include /**/ "ace/pre.h" + +#include "TL_ResetTopic_SenderEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Sender_exec_export.h" +#include "tao/LocalObject.h" + +#include <map> + +namespace CIAO_TL_ResetTopic_Sender_Impl +{ + class Sender_exec_i; + + /** + * Timeout_Handler + */ + class Timeout_Handler : + public ACE_Event_Handler + { + public: + Timeout_Handler (Sender_exec_i &callback); + /// Handle the timeout. + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + /// Maintains a handle that actually process the event + Sender_exec_i &callback_; + }; + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + virtual void set_new_topic (const char * topic_name); + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::CORBA::UShort iterations (void); + + virtual void iterations (::CORBA::UShort iterations); + + virtual ::CORBA::UShort keys (void); + + virtual void keys (::CORBA::UShort keys); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + bool set_topic_name (const char * topic_name); + bool set_topic_name_writer (const char * topic_name); + bool set_topic_name_updater (const char * topic_name); + void start_event_test (void); + //@} + + private: + ::TL_ResetTopic::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + + ::CORBA::UShort iterations_; + + ::CORBA::UShort keys_; + //@} + + //@{ + /** User defined members. */ + Timeout_Handler *to_handler_; + ACE_CString topic_name_, old_topic_name_; + + TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; + + typedef std::map<ACE_CString, TL_ResetTopicTest_var> Sample_Table; + + Sample_Table tests_; + //@} + + //@{ + /** User defined private operations. */ + void create_samples (void); + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_TL_ResetTopic_Sender_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp new file mode 100644 index 00000000000..6bad6fc3866 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp @@ -0,0 +1,338 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>ResetTopic_Depl_1</label> + <UUID>ResetTopic_Depl_1</UUID> + + <implementation xmi:id="ResetTopic_EventConnectorImplementation"> + <name>ResetTopic_EventConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TL_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TL_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ResetTopic_StateConnectorImplementation"> + <name>ResetTopic_StateConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TL_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TL_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SenderComponentImplementation"> + <name>SenderComponentImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TL_ResetTopic_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_TL_ResetTopic_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="ResetTopic_SenderEventConnectorInstance"> + <name>ResetTopic_SenderEventConnectorInstance</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="ResetTopic_EventConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_SenderStateConnectorInstance"> + <name>ResetTopic_SenderStateConnectorInstance</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="ResetTopic_StateConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderComponentInstance"> + <name>SenderComponent</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="SenderComponentImplementation" /> + <configProperty> + <name>rate</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>15</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>5</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>iterations</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>10</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>writer_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_write_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>supplier_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>updater_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_update_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>observable_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + <artifact xmi:id="Sender_StubArtifact"> + <name>Sender_stub</name> + <source/> + <node/> + <location>Sender_stub</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_ExecArtifact"> + <name>TL_ResetTopic_Connector_exec</name> + <source/> + <node/> + <location>TL_ResetTopicConnector_exec</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_SvntArtifact"> + <name>TL_ResetTopic_Connector_svnt</name> + <source/> + <node/> + <location>TL_ResetTopicConnector_svnt</location> + </artifact> + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + <artifact xmi:id="Receiver_StubArtifact"> + <name>Receiver_stub</name> + <source/> + <node/> + <location>Receiver_stub</location> + </artifact> +</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl new file mode 100755 index 00000000000..0a1c1735413 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl @@ -0,0 +1,265 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60001 ); +@iorbases = ( "SenderNode.ior" ); +@iorfiles = 0; +@nodenames = ( "SenderNode" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 10 seconds before clearing the topic name\n"; +sleep (10); + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before setting the topic name again\n"; +sleep (10); + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before stopping\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl new file mode 100644 index 00000000000..b5c336cb238 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl @@ -0,0 +1,24 @@ +// $Id$ + +/** + * @file UL_ResetTopic_Base.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef UL_RESETTOPIC_BASE_IDL +#define UL_RESETTOPIC_BASE_IDL + +#pragma ndds typesupport "Base/UL_ResetTopic_BaseSupport.h" +#pragma opendds typesupport "Base/UL_ResetTopic_BaseTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "UL_ResetTopicTest" +#pragma DCPS_DATA_KEY "UL_ResetTopicTest key" + +struct UL_ResetTopicTest { + string key; //@key + long iteration; +}; + +typedef sequence<UL_ResetTopicTest> UL_ResetTopicTestSeq; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc new file mode 100644 index 00000000000..bd879c16e8d --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (UL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname = UL_ResetTopicBase_stub + dynamicflags += UL_RESETTOPIC_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=UL_RESETTOPIC_BASE_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + UL_ResetTopic_Base.idl + } + + opendds_ts_flags += --export=UL_RESETTOPIC_BASE_STUB_Export + + DDSGenerator_Files { + UL_ResetTopic_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl new file mode 100644 index 00000000000..356d663a39a --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl @@ -0,0 +1,23 @@ +// $Id$ + +/** + * @file UL_ResetTopic_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef UL_RESETTOPIC_CONNECTOR_IDL_ +#define UL_RESETTOPIC_CONNECTOR_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/UL_ResetTopic_Base.idl" + +#pragma ciao lem "Connector/UL_ResetTopic_ConnectorE.idl" + +module UL_ResetTopic +{ + module ::CCM_DDS::Typed < ::UL_ResetTopicTest, ::UL_ResetTopicTestSeq> UL_ResetTopicTestConnector; +}; + +#endif /* UL_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc new file mode 100644 index 00000000000..2c4579b3a4f --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc @@ -0,0 +1,148 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l .. -o ../lib -u DDS UL_ResetTopic_Connector" + +project (UL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ + -Wb,skel_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,svnt_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,conn_export_macro=UL_RESETTOPIC_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ + -I .. + + IDL_Files { + UL_ResetTopic_Connector.idl + } +} + +project (UL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += UL_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=UL_ResetTopic_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + UL_ResetTopic_ConnectorE.idl + } +} + +project (UL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += UL_ResetTopicConnector_lem_gen UL_ResetTopicConnector_stub \ + UL_ResetTopicBase_stub + libs += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = UL_ResetTopicConnector_lem_stub + dynamicflags += UL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_ConnectorEC.cpp + } + + Header_Files { + UL_ResetTopic_ConnectorEC.h + UL_ResetTopic_Connector_lem_stub_export.h + } + + Inline_Files { + UL_ResetTopic_ConnectorEC.inl + } +} + +project (UL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { + after += UL_ResetTopicConnector_idl_gen UL_ResetTopicBase_stub + libs += UL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = UL_ResetTopicConnector_stub + dynamicflags += UL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_ConnectorC.cpp + } + + Header_Files { + UL_ResetTopic_ConnectorC.h + UL_ResetTopic_Connector_stub_export.h + } + + Inline_Files { + UL_ResetTopic_ConnectorC.inl + } +} + +project (UL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { + after += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub \ + UL_ResetTopicBase_stub + sharedname = UL_ResetTopicConnector_exec + libs += UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub \ + UL_ResetTopicBase_stub UL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += UL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_Connector_conn.cpp + } + + Header_Files { + UL_ResetTopic_Connector_conn.h + UL_ResetTopic_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project (UL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { + after += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_exec \ + UL_ResetTopicConnector_stub + sharedname = UL_ResetTopicConnector_svnt + libs += UL_ResetTopicConnector_stub \ + UL_ResetTopicConnector_lem_stub \ + UL_ResetTopicBase_stub \ + UL_ResetTopicConnector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += UL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_ConnectorS.cpp + UL_ResetTopic_Connector_svnt.cpp + } + + Header_Files { + UL_ResetTopic_ConnectorS.h + UL_ResetTopic_Connector_svnt.h + UL_ResetTopic_Connector_svnt_export.h + } + + Inline_Files { + UL_ResetTopic_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp new file mode 100644 index 00000000000..7189a56c2e8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp @@ -0,0 +1,88 @@ +//$Id$ +/* + * @file ReceiverDriver.cpp + * + * @author Marcel Smit + */ + + +#include "UL_ResetTopic_ReceiverC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior"); +const ACE_TCHAR *topic_name = ACE_TEXT (""); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + receiver_ior = get_opts.opt_arg (); + break; + + case 'n': + topic_name = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Receiver IOR> (default is file://Receiver.ior)\n" + "-n <new topic>\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var receiver_obj = + orb->string_to_object (receiver_ior); + + // downcast the object reference to the appropriate type + ::UL_ResetTopic::Receiver_var receiver = + ::UL_ResetTopic::Receiver::_narrow (receiver_obj.in ()); + + if (CORBA::is_nil (receiver.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to acquire 'Receiver' objref\n"), + -1); + } + receiver->set_new_topic (topic_name); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl new file mode 100644 index 00000000000..045716c67fa --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl @@ -0,0 +1,28 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef RECEIVER_IDL +#define RECEIVER_IDL + +#include "Connector/UL_ResetTopic_Connector.idl" + +module UL_ResetTopic +{ + interface ChangeTopicInterface + { + void set_new_topic (in string topic_name); + }; + + component Receiver supports ChangeTopicInterface + { + port UL_ResetTopicTestConnector::DDS_StateListen info_out_state; + + attribute unsigned short iterations; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc new file mode 100644 index 00000000000..0de0609a041 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc @@ -0,0 +1,163 @@ +// $Id$ + +project (UL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm { + custom_only = 1 + after += UL_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + -Wb,stub_export_include=Receiver_stub_export.h \ + -Wb,skel_export_macro=RECEIVER_SVNT_Export \ + -Wb,skel_export_include=Receiver_svnt_export.h \ + -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ + -Wb,svnt_export_include=Receiver_svnt_export.h \ + -Wb,exec_export_macro=RECEIVER_EXEC_Export \ + -Wb,exec_export_include=Receiver_exec_export.h \ + -I.. + IDL_Files { + UL_ResetTopic_Receiver.idl + } +} + +project (UL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm { + after += UL_ResetTopicReceiver_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ + -Wb,stub_export_include=Receiver_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + UL_ResetTopic_ReceiverE.idl + } +} + +project (UL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base { + after += UL_ResetTopicReceiver_lem_gen UL_ResetTopicReceiver_stub UL_ResetTopicConnector_stub UL_ResetTopicBase_stub + libs += Receiver_stub UL_ResetTopicConnector_stub UL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Receiver_lem_stub + dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_ReceiverEC.cpp + } + + Header_Files { + UL_ResetTopic_ReceiverEC.h + Receiver_lem_stub_export.h + } + + Inline_Files { + UL_ResetTopic_ReceiverEC.inl + } +} + +project (UL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base { + after += UL_ResetTopicReceiver_idl_gen UL_ResetTopicConnector_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_lem_gen + libs += UL_ResetTopicConnector_stub UL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Receiver_stub + dynamicflags += RECEIVER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_ReceiverC.cpp + } + + Header_Files { + UL_ResetTopic_ReceiverC.h + Receiver_stub_export.h + } + + Inline_Files { + UL_ResetTopic_ReceiverC.inl + } +} + +project (UL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += UL_ResetTopicReceiver_lem_stub UL_ResetTopicReceiver_stub \ + UL_ResetTopicBase_stub UL_ResetTopicConnector_stub \ + UL_ResetTopicConnector_lem_stub + sharedname = Receiver_exec + libs += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub \ + UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RECEIVER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_Receiver_exec.cpp + } + + Header_Files { + UL_ResetTopic_Receiver_exec.h + Receiver_exec_export.h + } + + Inline_Files { + } +} + + +project (UL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += UL_ResetTopicReceiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicReceiver_exec UL_ResetTopicConnector_lem_stub + sharedname = Receiver_svnt + libs += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt Receiver_exec UL_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RECEIVER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_ReceiverS.cpp + UL_ResetTopic_Receiver_svnt.cpp + } + + Header_Files { + UL_ResetTopic_ReceiverS.h + UL_ResetTopic_Receiver_svnt.h + Receiver_svnt_export.h + } + + Inline_Files { + UL_ResetTopic_ReceiverS.inl + } +} + +project (UL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { + exename = ReceiverDriver + after += UL_ResetTopicReceiver_stub UL_ResetTopicConnector_stub + libs += Receiver_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub + + includes += .. + libpaths += ../lib + + exeout = ../lib + IDL_Files { + } + + Source_Files { + ReceiverDriver.cpp + } + + Header_Files { + } + + Inline_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp new file mode 100644 index 00000000000..7132fb5cb15 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp @@ -0,0 +1,330 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "UL_ResetTopic_Receiver_exec.h" + +namespace CIAO_UL_ResetTopic_Receiver_Impl +{ + + /** + * Facet Executor Implementation Class: info_out_state_data_listener_exec_i + */ + + info_out_state_data_listener_exec_i::info_out_state_data_listener_exec_i ( + ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx, + Atomic_Boolean &samples_received) + : ciao_context_ ( + ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + , samples_received_(samples_received) + { + } + + info_out_state_data_listener_exec_i::~info_out_state_data_listener_exec_i (void) + { + } + + // Operations from ::UL_ResetTopic::UL_ResetTopicTestConnector::StateListener + + void + info_out_state_data_listener_exec_i::on_creation ( + const ::UL_ResetTopicTest & datum, + const ::CCM_DDS::ReadInfo & /* info */) + { + ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_creation - " + "Sample <%C> created\n", + datum.key.in ())); + } + + void + info_out_state_data_listener_exec_i::on_one_update ( + const ::UL_ResetTopicTest & datum, + const ::CCM_DDS::ReadInfo & /* info */) + { + this->samples_received_ = true; + ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_one_update - " + "Sample <%C> updated: <%u>\n", + datum.key.in (), + datum.iteration)); + } + + void + info_out_state_data_listener_exec_i::on_many_updates ( + const ::UL_ResetTopicTestSeq & /* data */, + const ::CCM_DDS::ReadInfoSeq & /* infos */) + { + /* Your code here. */ + } + + void + info_out_state_data_listener_exec_i::on_deletion ( + const ::UL_ResetTopicTest & /* datum */, + const ::CCM_DDS::ReadInfo & /* info */) + { + /* Your code here. */ + } + + /** + * Facet Executor Implementation Class: info_out_state_status_exec_i + */ + + info_out_state_status_exec_i::info_out_state_status_exec_i ( + ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + { + } + + info_out_state_status_exec_i::~info_out_state_status_exec_i (void) + { + } + + // Operations from ::CCM_DDS::PortStatusListener + + void + info_out_state_status_exec_i::on_requested_deadline_missed ( + ::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + info_out_state_status_exec_i::on_sample_lost ( + ::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) + { + /* Your code here. */ + } + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + Receiver_exec_i::Receiver_exec_i (void) + : iterations_ (0) + , samples_received_(false) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + // Supported operations and attributes. + void + Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp, + const char * topic_name) + { + if (::CORBA::is_nil (cmp)) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn = + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + conn->topic_name (topic_name); + +// ::CCM_DDS::DataListenerControl_var dlc = +// this->ciao_context_->get_connection_info_out_event_data_control (); +// dlc->mode (::CCM_DDS::ONE_BY_ONE); + } + + void + Receiver_exec_i::set_new_topic (const char * topic_name) + { + // The ReceiverDriver invokes this method. Therefor first check wether + // samples were received during last run + + if (this->samples_received_.value()) + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " + "OK, samples received during last run\n")); + else + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - " + "ERROR: No samples received during last run\n")); + + this->samples_received_ = false; + + ::CORBA::Object_var cmp; + try + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " + "Setting topic to <%C>\n", + topic_name)); + //First listener + ::UL_ResetTopic::UL_ResetTopicTestConnector::Reader_var reader = + this->ciao_context_->get_connection_info_out_state_data(); + + if (::CORBA::is_nil (reader.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - " + "ciao_info_out_event_data_listener_ seems nil\n")); + throw ::CORBA::INTERNAL (); + } + cmp = reader->_get_component (); + this->set_new_topic (cmp.in (), topic_name); + + //next listener + if (::CORBA::is_nil (this->ciao_info_out_state_status_.in ())) + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " + "ciao_info_out_event_status_ seems nil\n")); + } + else + { + cmp = this->ciao_info_out_state_status_->_get_component (); + this->set_new_topic (cmp.in (), topic_name); + } + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + } + } + + // Component attributes and port operations. + + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr + Receiver_exec_i::get_info_out_state_data_listener (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_state_data_listener_.in ())) + { + info_out_state_data_listener_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_state_data_listener_exec_i ( + this->ciao_context_.in (), + this->samples_received_), + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_nil ()); + + this->ciao_info_out_state_data_listener_ = tmp; + } + + return + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_duplicate ( + this->ciao_info_out_state_data_listener_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_out_state_status (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_state_status_.in ())) + { + info_out_state_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_state_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_out_state_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_out_state_status_.in ()); + } + + ::CORBA::UShort + Receiver_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Receiver_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + // Operations from Components::SessionComponent. + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::UL_ResetTopic::CCM_Receiver_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + ::CCM_DDS::StateListenerControl_var dlc = + this->ciao_context_->get_connection_info_out_state_data_control (); + dlc->mode (::CCM_DDS::ONE_BY_ONE); + } + + void + Receiver_exec_i::ccm_activate (void) + { + /* Your code here. */ + } + + void + Receiver_exec_i::ccm_passivate (void) + { + /* Your code here. */ + } + + void + Receiver_exec_i::ccm_remove (void) + { + if (this->samples_received_.value()) + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - " + "OK, samples received during last run\n")); + else + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - " + "ERROR: No samples received during last run\n")); + } + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_UL_ResetTopic_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Receiver_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h new file mode 100644 index 00000000000..a534a4378b1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h @@ -0,0 +1,199 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_ +#define CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_ + +#include /**/ "ace/pre.h" + +#include "UL_ResetTopic_ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Receiver_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIAO_UL_ResetTopic_Receiver_Impl +{ + typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean; + + /** + * Provider Executor Implementation Class: info_out_state_data_listener_exec_i + */ + + class info_out_state_data_listener_exec_i + : public virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener, + public virtual ::CORBA::LocalObject + { + public: + info_out_state_data_listener_exec_i ( + ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx, + Atomic_Boolean &samples_received); + virtual ~info_out_state_data_listener_exec_i (void); + + /** @name Operations and attributes from UL_ResetTopic::UL_ResetTopicTestConnector::StateListener */ + //@{ + + virtual + void on_creation ( + const ::UL_ResetTopicTest & datum, + const ::CCM_DDS::ReadInfo & info); + + virtual + void on_one_update ( + const ::UL_ResetTopicTest & datum, + const ::CCM_DDS::ReadInfo & info); + + virtual + void on_many_updates ( + const ::UL_ResetTopicTestSeq & data, + const ::CCM_DDS::ReadInfoSeq & infos); + + virtual + void on_deletion ( + const ::UL_ResetTopicTest & datum, + const ::CCM_DDS::ReadInfo & info); + //@} + + private: + ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_; + Atomic_Boolean &samples_received_; + }; + + /** + * Provider Executor Implementation Class: info_out_state_status_exec_i + */ + + class info_out_state_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + info_out_state_status_exec_i ( + ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx); + virtual ~info_out_state_status_exec_i (void); + + /** @name Operations and attributes from CCM_DDS::PortStatusListener */ + //@{ + + virtual + void on_requested_deadline_missed ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_; + }; + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + /** @name Supported operations and attributes. */ + //@{ + + virtual void set_new_topic ( + const char * topic_name); + + //@} + + /** @name Component attributes and port operations. */ + //@{ + + virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr + get_info_out_state_data_listener (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_out_state_status (void); + + virtual ::CORBA::UShort iterations ( + void); + + virtual void iterations ( + ::CORBA::UShort iterations); + //@} + + /** @name Operations from Components::SessionComponent. */ + //@{ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + /** @name User defined public operations. */ + //@{ + + //@} + + private: + ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_; + + /** @name Component attributes. */ + //@{ + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_var ciao_info_out_state_data_listener_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_state_status_; + + ::CORBA::UShort iterations_; + //@} + + /** @name User defined members. */ + //@{ + Atomic_Boolean samples_received_; + //@} + + /** @name User defined private operations. */ + //@{ + void set_new_topic (::CORBA::Object_ptr cmp, + const char * topic_name); + + //@} + }; + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_UL_ResetTopic_Receiver_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp new file mode 100644 index 00000000000..188954c8b23 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp @@ -0,0 +1,88 @@ +//$Id$ +/* + * @file SenderDriver.cpp + * + * @author Marcel Smit + */ + + +#include "UL_ResetTopic_SenderC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); +const ACE_TCHAR *topic_name = ACE_TEXT (""); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + sender_ior = get_opts.opt_arg (); + break; + + case 'n': + topic_name = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Sender IOR> (default is file://Sender.ior)\n" + "-n <new topic>\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var sender_obj = + orb->string_to_object (sender_ior); + + // downcast the object reference to the appropriate type + ::UL_ResetTopic::Sender_var sender = + ::UL_ResetTopic::Sender::_narrow (sender_obj.in ()); + + if (CORBA::is_nil (sender.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to acquire 'Sender' objref\n"), + -1); + } + sender->set_new_topic (topic_name); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl new file mode 100644 index 00000000000..2e17d246e34 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl @@ -0,0 +1,31 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + * + * by-hand idl3 translation of sender components. + */ + +#ifndef UL_RESETTOPIC_SENDER_IDL +#define UL_RESETTOPIC_SENDER_IDL + +#include "Connector/UL_ResetTopic_Connector.idl" + +module UL_ResetTopic +{ + interface ChangeTopicInterface + { + void set_new_topic (in string topic_name); + }; + + component Sender supports ChangeTopicInterface + { + port UL_ResetTopicTestConnector::DDS_Update info_update; + + attribute unsigned short iterations; + attribute unsigned short keys; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc new file mode 100644 index 00000000000..d8f536e893c --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc @@ -0,0 +1,166 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" + +project (UL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { + after += UL_ResetTopicConnector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + -Wb,stub_export_include=Sender_stub_export.h \ + -Wb,skel_export_macro=SENDER_SVNT_Export \ + -Wb,skel_export_include=Sender_svnt_export.h \ + -Wb,svnt_export_macro=SENDER_SVNT_Export \ + -Wb,svnt_export_include=Sender_svnt_export.h \ + -Wb,exec_export_macro=SENDER_EXEC_Export \ + -Wb,exec_export_include=Sender_exec_export.h \ + -I .. + + IDL_Files { + UL_ResetTopic_Sender.idl + } +} + +project (UL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { + after += UL_ResetTopicSender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=Sender_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors -I .. + + IDL_Files { + UL_ResetTopic_SenderE.idl + } +} + +project (UL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { + after += UL_ResetTopicSender_lem_gen UL_ResetTopicSender_stub UL_ResetTopicBase_stub + libs += UL_ResetTopicBase_stub Sender_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Sender_lem_stub + dynamicflags += SENDER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_SenderEC.cpp + } + + Header_Files { + UL_ResetTopic_SenderEC.h + Sender_lem_stub_export.h + } + + Inline_Files { + UL_ResetTopic_SenderEC.inl + } +} + +project (UL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { + after += UL_ResetTopicSender_idl_gen UL_ResetTopicBase_stub UL_ResetTopicConnector_stub + libs += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sender_stub + dynamicflags += SENDER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_SenderC.cpp + } + + Header_Files { + UL_ResetTopic_SenderC.h + Sender_stub_export.h + } + + Inline_Files { + UL_ResetTopic_SenderC.inl + } +} + +project (UL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { + after += UL_ResetTopicSender_lem_stub UL_ResetTopicSender_stub \ + UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub + sharedname = Sender_exec + libs += Sender_stub Sender_lem_stub UL_ResetTopicBase_stub \ + UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub + libpaths += ../lib + includes += .. + libout = ../lib + dynamicflags += SENDER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_Sender_exec.cpp + } + + Header_Files { + UL_ResetTopic_Sender_exec.h + Sender_exec_export.h + } + + Inline_Files { + } +} + + +project (UL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += UL_ResetTopicBase_stub UL_ResetTopicSender_lem_stub UL_ResetTopicConnector_stub \ + UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub + sharedname = Sender_svnt + libs += Sender_stub Sender_lem_stub \ + UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += SENDER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + UL_ResetTopic_SenderS.cpp + UL_ResetTopic_Sender_svnt.cpp + } + + Header_Files { + UL_ResetTopic_SenderS.h + UL_ResetTopic_Sender_svnt.h + Sender_svnt_export.h + } + + Inline_Files { + UL_ResetTopic_SenderS.inl + } +} + +project (UL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { + exename = SenderDriver + after += UL_ResetTopicSender_stub UL_ResetTopicConnector_stub + libs += Sender_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub + + includes += .. + libpaths += ../lib + + exeout = ../lib + IDL_Files { + } + + Source_Files { + SenderDriver.cpp + } + + Header_Files { + } + + Inline_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp new file mode 100644 index 00000000000..28a53498b03 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp @@ -0,0 +1,335 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "UL_ResetTopic_Sender_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_UL_ResetTopic_Sender_Impl +{ + + /** + * Timeout_Handler + */ + + Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) + : callback_ (callback) + { + } + + int + Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.start_event_test (); + return 0; + } + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + Sender_exec_i::Sender_exec_i (void) + : iterations_ (0) + , keys_ (0) + , to_handler_ (0) + , topic_name_ ("TopicI") + , old_topic_name_ ("TopicI") + { + ACE_NEW_THROW_EX (this->to_handler_, + Timeout_Handler (*this), + ::CORBA::INTERNAL ()); + } + + Sender_exec_i::~Sender_exec_i (void) + { + delete this->to_handler_; + } + + // Supported operations and attributes. + ACE_Reactor* + Sender_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void Sender_exec_i::create_samples (void) + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, _guard, + this->keys_lock_); + + for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) + { + char key[7]; + UL_ResetTopicTest *new_key = new UL_ResetTopicTest; + ACE_OS::sprintf (key, "KEY_%d", i); + new_key->key = CORBA::string_dup(key); + new_key->iteration = 0; + this->tests_[key] = new_key; + + ::UL_ResetTopic::UL_ResetTopicTestConnector::Updater_var updater = + this->ciao_context_->get_connection_info_update_data(); + + updater->create_one (*new_key); + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - " + "Sample <%C> created\n", + key)); + } + this->last_key_ = this->tests_.begin (); + } + + void Sender_exec_i::set_new_topic (const char * topic_name) + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + + this->old_topic_name_ = this->topic_name_; + this->topic_name_ = topic_name; + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " + "New topic name set <%C>\n", + topic_name)); + } + + void + Sender_exec_i::set_topic_name_updater (const char * topic_name) + { + try + { + if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " + "Setting topic to <%C>\n", + topic_name)); + this->old_topic_name_ = topic_name; + ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater = + this->ciao_context_->get_connection_info_update_data (); + if (::CORBA::is_nil (updater.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to get updater interface\n")); + throw ::CORBA::INTERNAL (); + } + ::CORBA::Object_var cmp = updater->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn = + ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + conn->topic_name (topic_name); + } + this->create_samples (); + } + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + } + } + + void + Sender_exec_i::start_event_test (void) + { + // Set the topic name on the connector first. Therefor we need to + // get to the connector first. + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); + try + { + if (this->last_key_ != this->tests_.end ()) + { + try + { + this->set_topic_name_updater (this->topic_name_.c_str ()); + ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater = + this->ciao_context_->get_connection_info_update_data (); + + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_) + ++this->last_key_->second->iteration; + updater->update_one (this->last_key_->second, ::DDS::HANDLE_NIL); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updated key <%C> with <%d>\n"), + this->last_key_->first.c_str (), + this->last_key_->second->iteration)); + } + } + catch (const CCM_DDS::InternalError& ) + { + ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n", + this->last_key_->first.c_str ())); + } + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_) + ++this->last_key_; + } + } + else + { + // Onto the next iteration + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_) + this->last_key_ = this->tests_.begin (); + while (this->last_key_ != this->tests_.end ()) + { + if (this->last_key_->second->iteration == this->iterations_) + { + ++this->last_key_; + } + else + { + break; + } + } + } + } + } + catch (const ::CORBA::Exception & ex) + { + ex._tao_print_exception("ERROR:"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " + "ERROR: Unexpected and unknown exception caught.\n")); + } + } + + // Component attributes and port operations. + + ::CORBA::UShort + Sender_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Sender_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + ::CORBA::UShort + Sender_exec_i::keys (void) + { + return this->keys_; + } + + void + Sender_exec_i::keys ( + const ::CORBA::UShort keys) + { + this->keys_ = keys; + } + + // Operations from Components::SessionComponent. + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::UL_ResetTopic::CCM_Sender_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Sender_exec_i::ccm_activate (void) + { + this->create_samples (); + + if (this->reactor ()->schedule_timer ( + this->to_handler_, + 0, + ACE_Time_Value (2, 0), + ACE_Time_Value (0, 500000)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling timer"))); + } + } + + void + Sender_exec_i::ccm_passivate (void) + { + this->reactor()->cancel_timer(this->to_handler_); + } + + void + Sender_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_UL_ResetTopic_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h new file mode 100644 index 00000000000..9bf485bdaa8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h @@ -0,0 +1,148 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ +#define CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ + +#include /**/ "ace/pre.h" + +#include "UL_ResetTopic_SenderEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Sender_exec_export.h" +#include "tao/LocalObject.h" + +#include <map> + +namespace CIAO_UL_ResetTopic_Sender_Impl +{ + class Sender_exec_i; + + /** + * Timeout_Handler + */ + class Timeout_Handler : + public ACE_Event_Handler + { + public: + Timeout_Handler (Sender_exec_i &callback); + /// Handle the timeout. + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + /// Maintains a handle that actually process the event + Sender_exec_i &callback_; + }; + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + virtual void set_new_topic (const char * topic_name); + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::CORBA::UShort iterations (void); + + virtual void iterations (::CORBA::UShort iterations); + + virtual ::CORBA::UShort keys (void); + + virtual void keys (::CORBA::UShort keys); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void set_topic_name_updater (const char * topic_name); + void start_event_test (void); + //@} + + private: + ::UL_ResetTopic::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + + ::CORBA::UShort iterations_; + + ::CORBA::UShort keys_; + //@} + + //@{ + /** User defined members. */ + Timeout_Handler *to_handler_; + ACE_CString topic_name_, old_topic_name_; + + TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; + TAO_SYNCH_RECURSIVE_MUTEX keys_lock_; + + typedef std::map<ACE_CString, UL_ResetTopicTest_var> Sample_Table; + + Sample_Table tests_; + Sample_Table::iterator last_key_; + + //@} + + //@{ + /** User defined private operations. */ + void create_samples (void); + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_UL_ResetTopic_Sender_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp new file mode 100644 index 00000000000..599fe92554a --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp @@ -0,0 +1,407 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>ResetTopic_Depl_1</label> + <UUID>ResetTopic_Depl_1</UUID> + + <implementation xmi:id="ReceiverComponentImplementation"> + <name>ReceiverComponentImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_UL_ResetTopic_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_UL_ResetTopic_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ResetTopic_StateConnectorImplementation"> + <name>ResetTopic_StateConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>UL_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>UL_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SenderComponentImplementation"> + <name>SenderComponentImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_UL_ResetTopic_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_UL_ResetTopic_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="ReceiverComponentInstance"> + <name>ReceiverComponent</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="ReceiverComponentImplementation" /> + <configProperty> + <name>iterations</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>10</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_SenderStateConnectorInstance"> + <name>ResetTopic_SenderStateConnectorInstance</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="ResetTopic_StateConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_ReceiverStateConnectorInstance"> + <name>ResetTopic_ReceiverStateConnectorInstance</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="ResetTopic_StateConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderComponentInstance"> + <name>SenderComponent</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="SenderComponentImplementation" /> + <configProperty> + <name>rate</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>15</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>5</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>iterations</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>10</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>state_listener</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_out_state_data_listener</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>push_state_observer_data_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>state_reader_listener</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_out_state_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>push_state_observer_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>state_datacontrol</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_out_state_data_control</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>push_state_observer_data_control</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>updater_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_update_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>observable_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + <artifact xmi:id="Sender_StubArtifact"> + <name>Sender_stub</name> + <source/> + <node/> + <location>Sender_stub</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_ExecArtifact"> + <name>UL_ResetTopic_Connector_exec</name> + <source/> + <node/> + <location>UL_ResetTopicConnector_exec</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_SvntArtifact"> + <name>UL_ResetTopic_Connector_svnt</name> + <source/> + <node/> + <location>UL_ResetTopicConnector_svnt</location> + </artifact> + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + <artifact xmi:id="Receiver_StubArtifact"> + <name>Receiver_stub</name> + <source/> + <node/> + <location>Receiver_stub</location> + </artifact> +</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl new file mode 100755 index 00000000000..0d55bfd5fdc --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl @@ -0,0 +1,281 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 2; +@ports = ( 60001, 60002 ); +@iorbases = ( "ReceiverNode.ior", "SenderNode.ior" ); +@iorfiles = 0; +@nodenames = ( "ReceiverNode", "SenderNode" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 10 seconds before changing topic name\n"; +sleep (10); + +$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII"); +$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before changing topic name\n"; +sleep (10); + +$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII"); +$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before stopping\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl new file mode 100644 index 00000000000..852665465f9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl @@ -0,0 +1,24 @@ +// $Id$ + +/** + * @file WL_ResetTopic_Base.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef WL_RESETTOPIC_BASE_IDL +#define WL_RESETTOPIC_BASE_IDL + +#pragma ndds typesupport "Base/WL_ResetTopic_BaseSupport.h" +#pragma opendds typesupport "Base/WL_ResetTopic_BaseTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "WL_ResetTopicTest" +#pragma DCPS_DATA_KEY "WL_ResetTopicTest key" + +struct WL_ResetTopicTest { + string key; //@key + long iteration; +}; + +typedef sequence<WL_ResetTopicTest> WL_ResetTopicTestSeq; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc new file mode 100644 index 00000000000..7d4c393fe03 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (WL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname = WL_ResetTopicBase_stub + dynamicflags += WL_RESETTOPIC_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=WL_RESETTOPIC_BASE_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + WL_ResetTopic_Base.idl + } + + opendds_ts_flags += --export=WL_RESETTOPIC_BASE_STUB_Export + + DDSGenerator_Files { + WL_ResetTopic_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl new file mode 100644 index 00000000000..458104748f6 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl @@ -0,0 +1,23 @@ +// $Id$ + +/** + * @file WL_ResetTopic_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef WL_RESETTOPIC_CONNECTOR_IDL_ +#define WL_RESETTOPIC_CONNECTOR_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/WL_ResetTopic_Base.idl" + +#pragma ciao lem "Connector/WL_ResetTopic_ConnectorE.idl" + +module WL_ResetTopic +{ + module ::CCM_DDS::Typed < ::WL_ResetTopicTest, ::WL_ResetTopicTestSeq> WL_ResetTopicTestConnector; +}; + +#endif /* WL_ResetTopic_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc new file mode 100644 index 00000000000..62db2b36ac7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc @@ -0,0 +1,148 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l .. -o ../lib -u DDS WL_ResetTopic_Connector" + +project (WL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \ + -Wb,skel_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,svnt_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \ + -Wb,conn_export_macro=WL_RESETTOPIC_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \ + -I .. + + IDL_Files { + WL_ResetTopic_Connector.idl + } +} + +project (WL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += WL_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=WL_ResetTopic_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + WL_ResetTopic_ConnectorE.idl + } +} + +project (WL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += WL_ResetTopicConnector_lem_gen WL_ResetTopicConnector_stub \ + WL_ResetTopicBase_stub + libs += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = WL_ResetTopicConnector_lem_stub + dynamicflags += WL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_ConnectorEC.cpp + } + + Header_Files { + WL_ResetTopic_ConnectorEC.h + WL_ResetTopic_Connector_lem_stub_export.h + } + + Inline_Files { + WL_ResetTopic_ConnectorEC.inl + } +} + +project (WL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base { + after += WL_ResetTopicConnector_idl_gen WL_ResetTopicBase_stub + libs += WL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = WL_ResetTopicConnector_stub + dynamicflags += WL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_ConnectorC.cpp + } + + Header_Files { + WL_ResetTopic_ConnectorC.h + WL_ResetTopic_Connector_stub_export.h + } + + Inline_Files { + WL_ResetTopic_ConnectorC.inl + } +} + +project (WL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl { + after += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub \ + WL_ResetTopicBase_stub + sharedname = WL_ResetTopicConnector_exec + libs += WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub \ + WL_ResetTopicBase_stub WL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += WL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_Connector_conn.cpp + } + + Header_Files { + WL_ResetTopic_Connector_conn.h + WL_ResetTopic_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project (WL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { + after += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_exec \ + WL_ResetTopicConnector_stub + sharedname = WL_ResetTopicConnector_svnt + libs += WL_ResetTopicConnector_stub \ + WL_ResetTopicConnector_lem_stub \ + WL_ResetTopicBase_stub \ + WL_ResetTopicConnector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += WL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_ConnectorS.cpp + WL_ResetTopic_Connector_svnt.cpp + } + + Header_Files { + WL_ResetTopic_ConnectorS.h + WL_ResetTopic_Connector_svnt.h + WL_ResetTopic_Connector_svnt_export.h + } + + Inline_Files { + WL_ResetTopic_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp new file mode 100644 index 00000000000..9f0535437c9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp @@ -0,0 +1,88 @@ +//$Id$ +/* + * @file ReceiverDriver.cpp + * + * @author Marcel Smit + */ + + +#include "WL_ResetTopic_ReceiverC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior"); +const ACE_TCHAR *topic_name = ACE_TEXT (""); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + receiver_ior = get_opts.opt_arg (); + break; + + case 'n': + topic_name = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Receiver IOR> (default is file://Receiver.ior)\n" + "-n <new topic>\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var receiver_obj = + orb->string_to_object (receiver_ior); + + // downcast the object reference to the appropriate type + ::WL_ResetTopic::Receiver_var receiver = + ::WL_ResetTopic::Receiver::_narrow (receiver_obj.in ()); + + if (CORBA::is_nil (receiver.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to acquire 'Receiver' objref\n"), + -1); + } + receiver->set_new_topic (topic_name); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl new file mode 100644 index 00000000000..439c960b511 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl @@ -0,0 +1,28 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef RECEIVER_IDL +#define RECEIVER_IDL + +#include "Connector/WL_ResetTopic_Connector.idl" + +module WL_ResetTopic +{ + interface ChangeTopicInterface + { + void set_new_topic (in string topic_name); + }; + + component Receiver supports ChangeTopicInterface + { + port WL_ResetTopicTestConnector::DDS_Listen info_out_event; + + attribute unsigned short iterations; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc new file mode 100644 index 00000000000..bd7eb36429a --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc @@ -0,0 +1,163 @@ +// $Id$ + +project (WL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm { + custom_only = 1 + after += WL_ResetTopicConnector_idl_gen + idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + -Wb,stub_export_include=Receiver_stub_export.h \ + -Wb,skel_export_macro=RECEIVER_SVNT_Export \ + -Wb,skel_export_include=Receiver_svnt_export.h \ + -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ + -Wb,svnt_export_include=Receiver_svnt_export.h \ + -Wb,exec_export_macro=RECEIVER_EXEC_Export \ + -Wb,exec_export_include=Receiver_exec_export.h \ + -I.. + IDL_Files { + WL_ResetTopic_Receiver.idl + } +} + +project (WL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm { + after += WL_ResetTopicReceiver_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ + -Wb,stub_export_include=Receiver_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + WL_ResetTopic_ReceiverE.idl + } +} + +project (WL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base { + after += WL_ResetTopicReceiver_lem_gen WL_ResetTopicReceiver_stub WL_ResetTopicConnector_stub WL_ResetTopicBase_stub + libs += Receiver_stub WL_ResetTopicConnector_stub WL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Receiver_lem_stub + dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_ReceiverEC.cpp + } + + Header_Files { + WL_ResetTopic_ReceiverEC.h + Receiver_lem_stub_export.h + } + + Inline_Files { + WL_ResetTopic_ReceiverEC.inl + } +} + +project (WL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base { + after += WL_ResetTopicReceiver_idl_gen WL_ResetTopicConnector_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_lem_gen + libs += WL_ResetTopicConnector_stub WL_ResetTopicBase_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Receiver_stub + dynamicflags += RECEIVER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_ReceiverC.cpp + } + + Header_Files { + WL_ResetTopic_ReceiverC.h + Receiver_stub_export.h + } + + Inline_Files { + WL_ResetTopic_ReceiverC.inl + } +} + +project (WL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub { + after += WL_ResetTopicReceiver_lem_stub WL_ResetTopicReceiver_stub \ + WL_ResetTopicBase_stub WL_ResetTopicConnector_stub \ + WL_ResetTopicConnector_lem_stub + sharedname = Receiver_exec + libs += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub \ + WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RECEIVER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_Receiver_exec.cpp + } + + Header_Files { + WL_ResetTopic_Receiver_exec.h + Receiver_exec_export.h + } + + Inline_Files { + } +} + + +project (WL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += WL_ResetTopicReceiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicReceiver_exec WL_ResetTopicConnector_lem_stub + sharedname = Receiver_svnt + libs += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt Receiver_exec WL_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += RECEIVER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_ReceiverS.cpp + WL_ResetTopic_Receiver_svnt.cpp + } + + Header_Files { + WL_ResetTopic_ReceiverS.h + WL_ResetTopic_Receiver_svnt.h + Receiver_svnt_export.h + } + + Inline_Files { + WL_ResetTopic_ReceiverS.inl + } +} + +project (WL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { + exename = ReceiverDriver + after += WL_ResetTopicReceiver_stub WL_ResetTopicConnector_stub + libs += Receiver_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub + + includes += .. + libpaths += ../lib + + exeout = ../lib + IDL_Files { + } + + Source_Files { + ReceiverDriver.cpp + } + + Header_Files { + } + + Inline_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp new file mode 100644 index 00000000000..8acf6fbead4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp @@ -0,0 +1,309 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "WL_ResetTopic_Receiver_exec.h" +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO_WL_ResetTopic_Receiver_Impl +{ + + /** + * Facet Executor Implementation Class: info_out_event_data_listener_exec_i + */ + + info_out_event_data_listener_exec_i::info_out_event_data_listener_exec_i ( + ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx, + Atomic_Boolean &samples_received) + : ciao_context_ ( + ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + , samples_received_(samples_received) + { + } + + info_out_event_data_listener_exec_i::~info_out_event_data_listener_exec_i (void) + { + } + + // Operations from ::WL_ResetTopic::WL_ResetTopicTestConnector::Listener + + void + info_out_event_data_listener_exec_i::on_one_data (const ::WL_ResetTopicTest & datum, + const ::CCM_DDS::ReadInfo & /* info */) + { + this->samples_received_ = true; + ACE_DEBUG ((LM_ERROR, ACE_TEXT ("info_out_event_data_listener_exec_i::on_one_data - ") + ACE_TEXT ("received data for <%C> at %u\n"), + datum.key.in (), + datum.iteration)); + } + + void + info_out_event_data_listener_exec_i::on_many_data (const ::WL_ResetTopicTestSeq & /* data */, + const ::CCM_DDS::ReadInfoSeq & /* infos */) + { + ACE_ERROR ((LM_ERROR, "info_out_event_data_listener_exec_i::on_many_data : " + "Error: No callback to this method expected.\n")); + } + + /** + * Facet Executor Implementation Class: info_out_event_status_exec_i + */ + + info_out_event_status_exec_i::info_out_event_status_exec_i ( + ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx)) + { + } + + info_out_event_status_exec_i::~info_out_event_status_exec_i (void) + { + } + + // Operations from ::CCM_DDS::PortStatusListener + + void + info_out_event_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + info_out_event_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) + { + /* Your code here. */ + } + + + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + Receiver_exec_i::Receiver_exec_i (void) + : iterations_ (0) + , samples_received_(0) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + // Supported operations and attributes. + void + Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp, + const char * topic_name) + { + if (::CORBA::is_nil (cmp)) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn = + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + conn->topic_name (topic_name); + +// ::CCM_DDS::DataListenerControl_var dlc = +// this->ciao_context_->get_connection_info_out_event_data_control (); +// dlc->mode (::CCM_DDS::ONE_BY_ONE); + } + + void + Receiver_exec_i::set_new_topic (const char * topic_name) + { + + if (this->samples_received_.value()) + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " + "OK, samples received during last run\n")); + else + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - " + "ERROR: No samples received during last run\n")); + + this->samples_received_ = false; + + ::CORBA::Object_var cmp; + try + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " + "Setting topic to <%C>\n", + topic_name)); + //First listener + ::WL_ResetTopic::WL_ResetTopicTestConnector::Reader_var reader = + this->ciao_context_->get_connection_info_out_event_data(); + + if (::CORBA::is_nil (reader.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - " + "ciao_info_out_event_data_listener_ seems nil\n")); + throw ::CORBA::INTERNAL (); + } + cmp = reader->_get_component (); + this->set_new_topic (cmp.in (), topic_name); + + //next listener + if (::CORBA::is_nil (this->ciao_info_out_event_status_.in ())) + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - " + "ciao_info_out_event_status_ seems nil\n")); + } + else + { + cmp = this->ciao_info_out_event_status_->_get_component (); + this->set_new_topic (cmp.in (), topic_name); + } + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + } + } + + // Component attributes and port operations. + + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr + Receiver_exec_i::get_info_out_event_data_listener (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_event_data_listener_.in ())) + { + info_out_event_data_listener_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_event_data_listener_exec_i ( + this->ciao_context_.in (), + this->samples_received_), + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_nil ()); + + this->ciao_info_out_event_data_listener_ = tmp; + } + + return + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_duplicate ( + this->ciao_info_out_event_data_listener_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_out_event_status (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_event_status_.in ())) + { + info_out_event_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_event_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_out_event_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_out_event_status_.in ()); + } + + ::CORBA::UShort + Receiver_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Receiver_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + // Operations from Components::SessionComponent. + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::WL_ResetTopic::CCM_Receiver_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Receiver_exec_i::ccm_activate (void) + { + ::CCM_DDS::DataListenerControl_var dlc = + this->ciao_context_->get_connection_info_out_event_data_control (); + dlc->mode (::CCM_DDS::ONE_BY_ONE); + } + + void + Receiver_exec_i::ccm_passivate (void) + { + } + + void + Receiver_exec_i::ccm_remove (void) + { + if (this->samples_received_.value()) + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - " + "OK, samples received during last run\n")); + else + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - " + "ERROR: No samples received during last run\n")); + } + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_WL_ResetTopic_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Receiver_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h new file mode 100644 index 00000000000..3bcf2cf692d --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h @@ -0,0 +1,181 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_ +#define CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_ + +#include /**/ "ace/pre.h" + +#include "WL_ResetTopic_ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Receiver_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIAO_WL_ResetTopic_Receiver_Impl +{ + typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean; + + /** + * Provider Executor Implementation Class: info_out_event_data_listener_exec_i + */ + + class info_out_event_data_listener_exec_i + : public virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener, + public virtual ::CORBA::LocalObject + { + public: + info_out_event_data_listener_exec_i ( + ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx, + Atomic_Boolean &samples_received); + virtual ~info_out_event_data_listener_exec_i (void); + + //@{ + /** Operations and attributes from WL_ResetTopic::WL_ResetTopicTestConnector::Listener. */ + + virtual + void on_one_data (const ::WL_ResetTopicTest & datum, + const ::CCM_DDS::ReadInfo & info); + + virtual + void on_many_data (const ::WL_ResetTopicTestSeq & data, + const ::CCM_DDS::ReadInfoSeq & infos); + //@} + + private: + ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_; + Atomic_Boolean &samples_received_; + }; + + /** + * Provider Executor Implementation Class: info_out_event_status_exec_i + */ + + class info_out_event_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + info_out_event_status_exec_i ( + ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx); + virtual ~info_out_event_status_exec_i (void); + + //@{ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ + + virtual + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_; + }; + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + virtual void set_new_topic (const char * topic_name); + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr + get_info_out_event_data_listener (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_out_event_status (void); + + virtual ::CORBA::UShort iterations (void); + + virtual void iterations (::CORBA::UShort iterations); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + + //@} + + private: + ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_var ciao_info_out_event_data_listener_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_event_status_; + + ::CORBA::UShort iterations_; + //@} + + //@{ + /** User defined members. */ + Atomic_Boolean samples_received_; + + //@} + + //@{ + /** User defined private operations. */ + void set_new_topic (::CORBA::Object_ptr cmp, + const char * topic_name); + + //@} + }; + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_WL_ResetTopic_Receiver_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp new file mode 100644 index 00000000000..69163d68adf --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp @@ -0,0 +1,88 @@ +//$Id$ +/* + * @file SenderDriver.cpp + * + * @author Marcel Smit + */ + + +#include "WL_ResetTopic_SenderC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior"); +const ACE_TCHAR *topic_name = ACE_TEXT (""); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + sender_ior = get_opts.opt_arg (); + break; + + case 'n': + topic_name = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Sender IOR> (default is file://Sender.ior)\n" + "-n <new topic>\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var sender_obj = + orb->string_to_object (sender_ior); + + // downcast the object reference to the appropriate type + ::WL_ResetTopic::Sender_var sender = + ::WL_ResetTopic::Sender::_narrow (sender_obj.in ()); + + if (CORBA::is_nil (sender.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to acquire 'Sender' objref\n"), + -1); + } + sender->set_new_topic (topic_name); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl new file mode 100644 index 00000000000..a9f15fccaec --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl @@ -0,0 +1,31 @@ +// $Id$ + +/** + * @file + * @author Marcel Smit <msmit@remedy.nl> + * + * by-hand idl3 translation of sender components. + */ + +#ifndef WL_RESETTOPIC_SENDER_IDL +#define WL_RESETTOPIC_SENDER_IDL + +#include "Connector/WL_ResetTopic_Connector.idl" + +module WL_ResetTopic +{ + interface ChangeTopicInterface + { + void set_new_topic (in string topic_name); + }; + + component Sender supports ChangeTopicInterface + { + port WL_ResetTopicTestConnector::DDS_Write info_write; + + attribute unsigned short iterations; + attribute unsigned short keys; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc new file mode 100644 index 00000000000..9bc89b7f5fa --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc @@ -0,0 +1,166 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender" + +project (WL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm { + after += WL_ResetTopicConnector_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + -Wb,stub_export_include=Sender_stub_export.h \ + -Wb,skel_export_macro=SENDER_SVNT_Export \ + -Wb,skel_export_include=Sender_svnt_export.h \ + -Wb,svnt_export_macro=SENDER_SVNT_Export \ + -Wb,svnt_export_include=Sender_svnt_export.h \ + -Wb,exec_export_macro=SENDER_EXEC_Export \ + -Wb,exec_export_include=Sender_exec_export.h \ + -I .. + + IDL_Files { + WL_ResetTopic_Sender.idl + } +} + +project (WL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm { + after += WL_ResetTopicSender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=Sender_lem_stub_export.h \ + -SS -Gxhst -I $CIAO_ROOT/connectors -I .. + + IDL_Files { + WL_ResetTopic_SenderE.idl + } +} + +project (WL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base { + after += WL_ResetTopicSender_lem_gen WL_ResetTopicSender_stub WL_ResetTopicBase_stub + libs += WL_ResetTopicBase_stub Sender_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = Sender_lem_stub + dynamicflags += SENDER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_SenderEC.cpp + } + + Header_Files { + WL_ResetTopic_SenderEC.h + Sender_lem_stub_export.h + } + + Inline_Files { + WL_ResetTopic_SenderEC.inl + } +} + +project (WL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base { + after += WL_ResetTopicSender_idl_gen WL_ResetTopicBase_stub WL_ResetTopicConnector_stub + libs += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sender_stub + dynamicflags += SENDER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_SenderC.cpp + } + + Header_Files { + WL_ResetTopic_SenderC.h + Sender_stub_export.h + } + + Inline_Files { + WL_ResetTopic_SenderC.inl + } +} + +project (WL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub { + after += WL_ResetTopicSender_lem_stub WL_ResetTopicSender_stub \ + WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub + sharedname = Sender_exec + libs += Sender_stub Sender_lem_stub WL_ResetTopicBase_stub \ + WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub + libpaths += ../lib + includes += .. + libout = ../lib + dynamicflags += SENDER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_Sender_exec.cpp + } + + Header_Files { + WL_ResetTopic_Sender_exec.h + Sender_exec_export.h + } + + Inline_Files { + } +} + + +project (WL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { + after += WL_ResetTopicBase_stub WL_ResetTopicSender_lem_stub WL_ResetTopicConnector_stub \ + WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub + sharedname = Sender_svnt + libs += Sender_stub Sender_lem_stub \ + WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += SENDER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + WL_ResetTopic_SenderS.cpp + WL_ResetTopic_Sender_svnt.cpp + } + + Header_Files { + WL_ResetTopic_SenderS.h + WL_ResetTopic_Sender_svnt.h + Sender_svnt_export.h + } + + Inline_Files { + WL_ResetTopic_SenderS.inl + } +} + +project (WL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub { + exename = SenderDriver + after += WL_ResetTopicSender_stub WL_ResetTopicConnector_stub + libs += Sender_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub + + includes += .. + libpaths += ../lib + + exeout = ../lib + IDL_Files { + } + + Source_Files { + SenderDriver.cpp + } + + Header_Files { + } + + Inline_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp new file mode 100644 index 00000000000..a90f457a4e1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp @@ -0,0 +1,283 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "WL_ResetTopic_Sender_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_WL_ResetTopic_Sender_Impl +{ + + /** + * Timeout_Handler + */ + + Timeout_Handler::Timeout_Handler (Sender_exec_i &callback) + : callback_ (callback) + { + } + + int + Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.start_event_test (); + return 0; + } + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + Sender_exec_i::Sender_exec_i (void) + : iterations_ (0) + , keys_ (0) + , to_handler_ (0) + , topic_name_ ("TopicI") + , old_topic_name_ ("TopicI") + { + ACE_NEW_THROW_EX (this->to_handler_, + Timeout_Handler (*this), + ::CORBA::INTERNAL ()); + } + + Sender_exec_i::~Sender_exec_i (void) + { + delete this->to_handler_; + } + + // Supported operations and attributes. + ACE_Reactor* + Sender_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void Sender_exec_i::set_new_topic (const char * topic_name) + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + + this->old_topic_name_ = this->topic_name_; + this->topic_name_ = topic_name; + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - " + "New topic name set <%C>\n", + topic_name)); + } + + void + Sender_exec_i::set_topic_name_writer (const char * topic_name) + { + try + { + if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0) + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " + "Setting topic to <%C>\n", + topic_name)); + this->old_topic_name_ = topic_name; + ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (::CORBA::is_nil (writer.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to get writer interface\n")); + throw ::CORBA::INTERNAL (); + } + ::CORBA::Object_var cmp = writer->_get_component (); + if (::CORBA::is_nil (cmp.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to get component interface\n")); + throw ::CORBA::INTERNAL (); + } + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn = + ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ()); + if (::CORBA::is_nil (conn.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Unable to narrow connector interface\n")); + throw ::CORBA::INTERNAL (); + } + { + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_); + conn->topic_name (topic_name); + } + } + } + catch (const ::CCM_DDS::NonChangeable &) + { + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + } + } + + void + Sender_exec_i::start_event_test (void) + { + // Set the topic name on the connector first. Therefor we need to + // get to the connector first. + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n")); + try + { + for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key) + { + WL_ResetTopicTest sample; + char tmp[7]; + ACE_OS::sprintf (tmp, "KEY_%d", key); + sample.key = CORBA::string_dup(tmp); + + for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter) + { + this->set_topic_name_writer (this->topic_name_.c_str ()); + ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + sample.iteration = iter; + writer->write_one (sample, ::DDS::HANDLE_NIL); + + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - " + "Sample for topic <%C> written : key <%C> - iteration <%d>\n", + this->topic_name_.c_str (), tmp, iter)); + + ACE_Time_Value tv (0, 50000); + ACE_OS::sleep (tv); + } + } + } + catch (const ::CORBA::Exception & ex) + { + ex._tao_print_exception("ERROR:"); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - " + "ERROR: Unexpected and unknown exception caught.\n")); + } + } + + // Component attributes and port operations. + + ::CORBA::UShort + Sender_exec_i::iterations (void) + { + return this->iterations_; + } + + void + Sender_exec_i::iterations ( + const ::CORBA::UShort iterations) + { + this->iterations_ = iterations; + } + + ::CORBA::UShort + Sender_exec_i::keys (void) + { + return this->keys_; + } + + void + Sender_exec_i::keys ( + const ::CORBA::UShort keys) + { + this->keys_ = keys; + } + + // Operations from Components::SessionComponent. + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::WL_ResetTopic::CCM_Sender_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Sender_exec_i::ccm_activate (void) + { + if (this->reactor ()->schedule_timer ( + this->to_handler_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (5, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling timer"))); + } + } + + void + Sender_exec_i::ccm_passivate (void) + { + this->reactor()->cancel_timer(this->to_handler_); + } + + void + Sender_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_WL_ResetTopic_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h new file mode 100644 index 00000000000..b13f6176bfb --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h @@ -0,0 +1,139 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ +#define CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_ + +#include /**/ "ace/pre.h" + +#include "WL_ResetTopic_SenderEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Sender_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIAO_WL_ResetTopic_Sender_Impl +{ + class Sender_exec_i; + + /** + * Timeout_Handler + */ + class Timeout_Handler : + public ACE_Event_Handler + { + public: + Timeout_Handler (Sender_exec_i &callback); + /// Handle the timeout. + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + /// Maintains a handle that actually process the event + Sender_exec_i &callback_; + }; + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + virtual void set_new_topic (const char * topic_name); + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::CORBA::UShort iterations (void); + + virtual void iterations (::CORBA::UShort iterations); + + virtual ::CORBA::UShort keys (void); + + virtual void keys (::CORBA::UShort keys); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void set_topic_name_writer (const char * topic_name); + void start_event_test (void); + //@} + + private: + ::WL_ResetTopic::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + + ::CORBA::UShort iterations_; + + ::CORBA::UShort keys_; + //@} + + //@{ + /** User defined members. */ + Timeout_Handler *to_handler_; + ACE_CString topic_name_, old_topic_name_; + + TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_; + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_WL_ResetTopic_Sender_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp new file mode 100644 index 00000000000..31cdd7950ce --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp @@ -0,0 +1,407 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>ResetTopic_Depl_1</label> + <UUID>ResetTopic_Depl_1</UUID> + + <implementation xmi:id="ReceiverComponentImplementation"> + <name>ReceiverComponentImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_WL_ResetTopic_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_WL_ResetTopic_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ResetTopic_EventConnectorImplementation"> + <name>ResetTopic_EventConnectorImplementation</name> + <source/> + <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" /> + <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>WL_ResetTopic_Connector_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>WL_ResetTopic_Connector_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="SenderComponentImplementation"> + <name>SenderComponentImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_WL_ResetTopic_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_WL_ResetTopic_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="ReceiverComponentInstance"> + <name>ReceiverComponent</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="ReceiverComponentImplementation" /> + <configProperty> + <name>iterations</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>10</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_SenderEventConnectorInstance"> + <name>ResetTopic_SenderEventConnectorInstance</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="ResetTopic_EventConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="ResetTopic_ReceiverEventConnectorInstance"> + <name>ResetTopic_ReceiverEventConnectorInstance</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="ResetTopic_EventConnectorImplementation" /> + <configProperty> + <name>topic_name</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TopicI</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderComponentInstance"> + <name>SenderComponent</name> + <node>SenderNode</node> + <source/> + <implementation xmi:idref="SenderComponentImplementation" /> + <configProperty> + <name>rate</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>15</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>5</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>iterations</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>10</ushort> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>event_listener</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_out_event_data_listener</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>event_reader_listener</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_out_event_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>event_datacontrol</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_out_event_data_control</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>push_consumer_data_control</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <connection> + <name>writer_connection</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_write_data</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>supplier_data</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ResetTopic_SenderEventConnectorInstance" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + <artifact xmi:id="Sender_StubArtifact"> + <name>Sender_stub</name> + <source/> + <node/> + <location>Sender_stub</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_ExecArtifact"> + <name>WL_ResetTopic_Connector_exec</name> + <source/> + <node/> + <location>WL_ResetTopicConnector_exec</location> + </artifact> + <artifact xmi:id="ResetTopic_Connector_SvntArtifact"> + <name>WL_ResetTopic_Connector_svnt</name> + <source/> + <node/> + <location>WL_ResetTopicConnector_svnt</location> + </artifact> + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + <artifact xmi:id="Receiver_StubArtifact"> + <name>Receiver_stub</name> + <source/> + <node/> + <location>Receiver_stub</location> + </artifact> +</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl new file mode 100755 index 00000000000..0d55bfd5fdc --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl @@ -0,0 +1,281 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 2; +@ports = ( 60001, 60002 ); +@iorbases = ( "ReceiverNode.ior", "SenderNode.ior" ); +@iorfiles = 0; +@nodenames = ( "ReceiverNode", "SenderNode" ); + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 10 seconds before changing topic name\n"; +sleep (10); + +$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII"); +$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before changing topic name\n"; +sleep (10); + +$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII"); +$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII"); +$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); +if ($driver_status != 0) { + print STDERR "ERROR: unable to launch driver\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds before stopping\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README b/CIAO/connectors/dds4ccm/tests/SLManyByMany/README index b7cacabe8ed..1e0b50b4e2e 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/README @@ -1,9 +1,9 @@ -# $Id$ +$Id$ This is a test for the StateListener when the StateListenerControl is in the MANY_BY_MANY mode. The test uses the Updater to sent samples. -With a create_one ( 1 sample) and create_many (3 samples) of the Updater, +With a create_one ( 1 sample) and create_many (3 samples) of the Updater, the on_creation must be triggered ( 4 times 1 sample). With a delete_one ( 1 sample) and a delete_many (3 samples) of the Updater, @@ -20,7 +20,7 @@ In on_deletion, the returning dataum.key is tested . The key shouldn't be empty, because of the <serialize_key_with_dispose> and <propagate_dispose_of_unregistered_instances> settings in the QoS . -Beccause the StateListener performs a get, a read_all of a Reader shouldn't receive any samples -after the Statelistener has received his triggers. - +Beccause the StateListener performs a get, a read_all of a Reader shouldn't receive any samples +after the Statelistener has received his triggers. + diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml index 0985f8d04e5..0198cd24e8c 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml index 9f98bcdc886..8dc0abcbf5b 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README index 8986a3b67ca..211c76c483c 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ Tests whether the connector attribute are properly set by the D&C framework. diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml index eff6344c21b..90aaf3e5ce4 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="Shared_Library"> <qos_profile name="Shared_Profile" is_default_qos="true"> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README index fc697e66371..1c3aea8ec3d 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ To save resources, every subsequent connector with the same library name and profile name, should get the same domain- diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml index eff6344c21b..90aaf3e5ce4 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="Shared_Library"> <qos_profile name="Shared_Profile" is_default_qos="true"> diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README index 9be82d2e260..e903b33153f 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ This test tests all possible connections between a Sender and a DDS State connector and a Receiver and a diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README index c7b52e154a0..ad29e67c74c 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README @@ -1,4 +1,4 @@ -# $Id$ +$Id$ UnkeyedSamples consists of a Sender and a Receiver. The Sender writes samples unkeyed; the Receiver should diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml index 5c204d1d16b..aa0c9673d4d 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + <!-- Description diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc index aefd0eb4deb..5e9b25b0aba 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc @@ -27,4 +27,3 @@ project (Shapes_ShapeType_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes Source_Files { } } - diff --git a/CIAO/connectors/tests/AMIDDS/README.txt b/CIAO/connectors/tests/AMIDDS/README.txt index 18f606cfd32..f9e82d907ad 100644 --- a/CIAO/connectors/tests/AMIDDS/README.txt +++ b/CIAO/connectors/tests/AMIDDS/README.txt @@ -1,3 +1,3 @@ -// $Id$ +$Id$ This test combines ami4ccm and dds4ccm. diff --git a/CIAO/docs/CIAO_Style_Guide.txt b/CIAO/docs/CIAO_Style_Guide.txt index 7df9afbea3a..d0650bf1f35 100644 --- a/CIAO/docs/CIAO_Style_Guide.txt +++ b/CIAO/docs/CIAO_Style_Guide.txt @@ -1,3 +1,5 @@ +$Id$ + Error/Debug messages ======================== ciao_debug_level () and associated environment are no longer used. diff --git a/CIAO/docs/Porting_Hints.txt b/CIAO/docs/Porting_Hints.txt index 3595b992643..0b238da315c 100644 --- a/CIAO/docs/Porting_Hints.txt +++ b/CIAO/docs/Porting_Hints.txt @@ -1,3 +1,5 @@ +$Id$ + Porting applications to the refactored DAnCE: 1) ciao_client_dnc base projects should be changed to ccm_stub diff --git a/CIAO/examples/BasicSP/EC/README b/CIAO/examples/BasicSP/EC/README index 7e032780ab1..e1ed4164613 100644 --- a/CIAO/examples/BasicSP/EC/README +++ b/CIAO/examples/BasicSP/EC/README @@ -1,5 +1,7 @@ /** +$Id$ + @page EC README File The EC component. This shouldnt be needed if we had a way to diff --git a/CIAO/examples/DevGuideExamples/readme.txt b/CIAO/examples/DevGuideExamples/readme.txt index f6efa4d084f..dbea6964307 100644 --- a/CIAO/examples/DevGuideExamples/readme.txt +++ b/CIAO/examples/DevGuideExamples/readme.txt @@ -1,3 +1,5 @@ +$Id$ + "These examples were developed by and are included in this distribution with the permission of Object Computing, Inc. (OCI) for the purpose of illustrating the usage of certain features of diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/README b/CIAO/performance-tests/Benchmark/Multi_Threaded/README index 0cadcfc8e51..7cb5a39300a 100644 --- a/CIAO/performance-tests/Benchmark/Multi_Threaded/README +++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/README @@ -1,12 +1,14 @@ /** +$Id$ + @page Multi_Threaded README File - - This black box experiment measures "multi-threading" support present in CIAO. -In this test, a client component spawns four threads that concurrently invoke operations + + This black box experiment measures "multi-threading" support present in CIAO. +In this test, a client component spawns four threads that concurrently invoke operations on the server. The latency, throughput and jitter for each thread is printed out. The -motivation of this test is to observe scalability when a ComponentServer receives -multiple requests from parallel clients. A sister test, ../Multi_Process documents +motivation of this test is to observe scalability when a ComponentServer receives +multiple requests from parallel clients. A sister test, ../Multi_Process documents behavior as parallel clients (separate processes) invoke requests on the server. */ diff --git a/CIAO/performance-tests/Benchmark/README b/CIAO/performance-tests/Benchmark/README index 97390d0ec0b..622494616c9 100644 --- a/CIAO/performance-tests/Benchmark/README +++ b/CIAO/performance-tests/Benchmark/README @@ -1,10 +1,12 @@ /** +$Id$ + @page BasicSP README File The most basic of the Boeing scenarios that form part of the OEP. This is done to illustrate how the OEP can be implemented using -CIAO. +CIAO. Compilation of the CIDL compiler source code requires the Boost library, which is not included in this distribution of diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/README b/CIAO/performance-tests/Benchmark/RoundTrip/README index 8bd003eaf72..8f61244d8be 100644 --- a/CIAO/performance-tests/Benchmark/RoundTrip/README +++ b/CIAO/performance-tests/Benchmark/RoundTrip/README @@ -1,9 +1,11 @@ /** +$Id$ + @page RoundTrip README File - The RoundTrip component. This component measures the round-trip -latency for single-threaded case. This test adapted from + The RoundTrip component. This component measures the round-trip +latency for single-threaded case. This test adapted from $TAO_ROOT/performance-tests/Latency/Single_Threaded */ diff --git a/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt b/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt index a9b27abedd8..dc71dcf124c 100644 --- a/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt +++ b/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt @@ -1,3 +1,5 @@ +$Id$ + This directory contains various XML descriptors and configuration files required to run benchmarking experiments using CIAO in different ways. Let's go over a few important files first: diff --git a/CIAO/tests/CIDL/CodeGen/README b/CIAO/tests/CIDL/CodeGen/README index da6e8f6ee90..f0bfc77a847 100644 --- a/CIAO/tests/CIDL/CodeGen/README +++ b/CIAO/tests/CIDL/CodeGen/README @@ -1,3 +1,4 @@ +$Id$ Code Generation Test ======================== diff --git a/CIAO/tests/CIF/Common/CIF_Common.cpp b/CIAO/tests/CIF/Common/CIF_Common.cpp index 8f7c47ffde6..7760e220f05 100644 --- a/CIAO/tests/CIF/Common/CIF_Common.cpp +++ b/CIAO/tests/CIF/Common/CIF_Common.cpp @@ -11,9 +11,16 @@ CIF_Common::CIF_Common(void) CIF_Common::~CIF_Common(void) { - if (! ::CORBA::is_nil (this->orb_.in ())) + try + { + if (! ::CORBA::is_nil (this->orb_.in ())) + { + this->orb_->destroy (); + } + } + catch (const ::CORBA::Exception &e) { - this->orb_->destroy (); + e._tao_print_exception ("~CIF_Common - "); } } diff --git a/CIAO/tests/Collocation/Coll_Base/Base.idl b/CIAO/tests/Collocation/Coll_Base/Base.idl new file mode 100644 index 00000000000..d1ba48ad9f3 --- /dev/null +++ b/CIAO/tests/Collocation/Coll_Base/Base.idl @@ -0,0 +1,19 @@ +// $Id$ +#ifndef BASE_IDL_ +#define BASE_IDL_ + +#pragma ciao lem "Coll_Base/BaseE.idl" + +struct pointer_id + { + long point; + string txt; + }; + +// Interfaces for communication between Sender and Receiver +interface Hello { + void set_point(in pointer_id p, in string strategy); + }; + + +#endif /* BASE_IDL_ */ diff --git a/CIAO/tests/Collocation/Coll_Base/Base.mpc b/CIAO/tests/Collocation/Coll_Base/Base.mpc new file mode 100644 index 00000000000..71e624a9d43 --- /dev/null +++ b/CIAO/tests/Collocation/Coll_Base/Base.mpc @@ -0,0 +1,110 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n -e -I .. -l ../lib -o ../lib Base" + +project(CollBase_idl_gen) : componentidldefaults { + custom_only = 1 + + idlflags += -Wb,stub_export_macro=BASE_STUB_Export \ + -Wb,stub_export_include=CollBase_stub_export.h \ + -Wb,skel_export_macro=BASE_SKEL_Export \ + -Wb,skel_export_include=CollBase_skel_export.h \ + -Gxhex -Gxhsk -Gxhst -Gex -Sp -I .. + + IDL_Files { + Base.idl + } +} + +project(CollBase_lem_gen) : ciaoidldefaults { + after += CollBase_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=BASE_LEM_STUB_Export \ + -Wb,stub_export_include=CollBase_lem_stub_export.h \ + -SS -Gxhst -I .. + + IDL_Files { + BaseE.idl + } +} + +project(CollBase_lem_stub) : ccm_svnt { + after += CollBase_lem_gen CollBase_stub + libs += CollBase_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = CollBase_lem_stub + dynamicflags += BASE_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseEC.cpp + } + + Header_Files { + BaseEC.h + CollBase_lem_stub_export.h + } + + Inline_Files { + BaseEC.inl + } +} + +project(CollBase_stub) : ccm_stub { + after += CollBase_idl_gen + libs += + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = CollBase_stub + dynamicflags += BASE_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseC.cpp + } + + Header_Files { + BaseC.h + CollBase_stub_export.h + } + + Inline_Files { + BaseC.inl + } +} + + +project(CollBase_skel) : ciao_executor { + after += CollBase_stub CollBase_lem_stub + sharedname = CollBase_skel + libs += CollBase_stub + + includes += .. + libpaths += ../lib + libout = ../lib + dynamicflags += BASE_SKEL_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseS.cpp + } + + Header_Files { + BaseS.h + CollBase_skel_export.h + } + + Inline_Files { + BaseS.inl + } +} + + diff --git a/CIAO/tests/Collocation/README b/CIAO/tests/Collocation/README new file mode 100644 index 00000000000..56b3f857017 --- /dev/null +++ b/CIAO/tests/Collocation/README @@ -0,0 +1,25 @@ +// $Id$ + +This test is used to test collocation. + +CIAO has to be build with ccm_direct_collocation=1 + +In order to make sure that indeed direct collocation is used, the test self +is build with -Sp (see Base.mpc),so collocation thru_poa is disabled. + +The test runs with different CollocationStrategies, defined in the deploymentplans: +- PlanAllOnOneNoTP ( Sender and Receiver same process) with -ORBCollocationStrategy thru_poa: + because thru_poa is disabled, we expect an internal exception. +- PlanAllOnOne ( Sender and Receiver same process) with -ORBCollocationStrategy direct: + we expect collocation and because thru_poa is disabled, this must be direct collocation. +- PlanAllOnOneBest ( Sender and Receiver same process) with -ORBCollocationStrategy best: + we expect collocation and because thru_poa is disabled, this must be direct collocation. +- PlanAllOnOneNo ( Sender and Receiver same process) with -ORBCollocation no: + we expect no collocation. + +- PlanAllOnOneMore ( Sender and Receiver different process) with -ORBCollocationStrategy direct: + we expect no collocation, but a remote strategy because the Sender and Receiver are not in the same process. + + + + diff --git a/CIAO/tests/Collocation/Receiver/Receiver.idl b/CIAO/tests/Collocation/Receiver/Receiver.idl new file mode 100644 index 00000000000..d40e794b9ad --- /dev/null +++ b/CIAO/tests/Collocation/Receiver/Receiver.idl @@ -0,0 +1,17 @@ +// $Id$ + +#ifndef RECEIVER_IDL_ +#define RECEIVER_IDL_ + +#include <Components.idl> + +#include "Coll_Base/Base.idl" + +component Receiver { + // Which interfaces Receiver uses. + uses Hello hello_to_rec; + + attribute string strategy; +}; + +#endif /* RECEIVER_IDL_ */ diff --git a/CIAO/tests/Collocation/Receiver/Receiver.mpc b/CIAO/tests/Collocation/Receiver/Receiver.mpc new file mode 100644 index 00000000000..eeb86e2c23a --- /dev/null +++ b/CIAO/tests/Collocation/Receiver/Receiver.mpc @@ -0,0 +1,139 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p Base -c IDL2Client -e -I .. -l ../lib -o ../lib Receiver" + +project(CollBase_Receiver_idl_gen) : componentidldefaults { + custom_only = 1 + + idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + -Wb,stub_export_include=Receiver_stub_export.h \ + -Wb,skel_export_macro=RECEIVER_SVNT_Export \ + -Wb,skel_export_include=Receiver_svnt_export.h \ + -Wb,exec_export_macro=RECEIVER_EXEC_Export \ + -Wb,exec_export_include=Receiver_exec_export.h \ + -Gxhex -Gxhsk -Gxhst -I .. + + IDL_Files { + Receiver.idl + } +} + +project(CollBase_Receiver_lem_gen) : ciaoidldefaults { + after += CollBase_Receiver_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ + -Wb,stub_export_include=Receiver_lem_stub_export.h \ + -SS -Gxhst -I .. + + IDL_Files { + ReceiverE.idl + } +} + +project(CollBase_Receiver_lem_stub) : ccm_svnt { + after += CollBase_Receiver_lem_gen CollBase_Receiver_stub CollBase_stub CollBase_lem_stub + libs += CollBase_stub CollBase_lem_stub Receiver_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Receiver_lem_stub + dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + ReceiverEC.cpp + } + + Header_Files { + ReceiverEC.h + Receiver_lem_stub_export.h + } + + Inline_Files { + ReceiverEC.inl + } +} + +project(CollBase_Receiver_stub) : ccm_stub { + after += CollBase_Receiver_idl_gen CollBase_stub CollBase_lem_stub + libs += CollBase_stub CollBase_lem_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Receiver_stub + dynamicflags += RECEIVER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + ReceiverC.cpp + } + + Header_Files { + ReceiverC.h + Receiver_stub_export.h + } + + Inline_Files { + ReceiverC.inl + } +} + +project(CollBase_Receiver_exec) : ciao_executor { + after += CollBase_lem_stub CollBase_Receiver_lem_stub CollBase_Receiver_stub + sharedname = Receiver_exec + libs += CollBase_lem_stub Receiver_stub Receiver_lem_stub CollBase_stub CollBase_lem_stub + includes += .. + libpaths += ../lib + libout = ../lib + dynamicflags += RECEIVER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Receiver_exec.cpp + } + + Header_Files { + Receiver_exec.h + Receiver_exec_export.h + } + + Inline_Files { + } +} + + +project(CollBase_Receiver_svnt) : ciao_servant { + after += CollBase_skel CollBase_lem_stub CollBase_Receiver_lem_stub + sharedname = Receiver_svnt + libs += Receiver_stub Receiver_lem_stub \ + CollBase_skel \ + CollBase_stub \ + CollBase_lem_stub + includes += .. + libpaths += ../lib + libout = ../lib + dynamicflags += RECEIVER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + ReceiverS.cpp + Receiver_svnt.cpp + } + + Header_Files { + ReceiverS.h + Receiver_svnt.h + Receiver_svnt_export.h + } + + Inline_Files { + ReceiverS.inl + } +} diff --git a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp new file mode 100644 index 00000000000..271e921535b --- /dev/null +++ b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp @@ -0,0 +1,230 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "Receiver_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_Receiver_Impl +{ + + /** + * HelloGenerator + */ + + HelloGenerator::HelloGenerator (Receiver_exec_i &generator) + : generator_ (generator) + { + } + + int + HelloGenerator::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->generator_.tick (); + return 0; + } + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + Receiver_exec_i::Receiver_exec_i (void) + : interval_ (2, 1), + strategy_("thru_poa") + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::Receiver_exec_i \n ")); + ACE_NEW_THROW_EX (this->hello_generator_, + HelloGenerator (*this), + ::CORBA::NO_MEMORY ()); + + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + // Supported operations and attributes. + ACE_Reactor* + Receiver_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void + Receiver_exec_i::tick (void) + { + try + { + /// Retrieve the connection to the sender. + Hello_var hello_to_rec = + this->ciao_context_->get_connection_hello_to_rec (); + if (! ::CORBA::is_nil (hello_to_rec.in ())) + { + pointer_id::_var_type p = new pointer_id; + p->point = (long)p.ptr (); + hello_to_rec->set_point(p.in(), this->strategy_.in()); + + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::tick - " + "set_hello-point with pointer %@\n", + (void *)p.ptr ())); + + } + else + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::tick - " + "no connection hello_to_rec with sender.\n")); + } + } + catch (const CORBA::INTERNAL& /*ex*/) + { + if (ACE_OS::strcmp ("no_thru_poa", this->strategy_)== 0) + { + ACE_DEBUG ((LM_DEBUG, "OK: Receiver received expected exception\n")); + } + else + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::tick - " + "Error: Unexpected exception caught\n")); + } + } + catch (const CORBA::Exception &e) + { + /// Always catch CORBA exceptions. There might be somthing wrong with + /// the CIAO framework (i.e. connection lost). + e._tao_print_exception("Receiverr_exec_i::tick - " + "Error: Unexpected exception"); + } + catch (...) + { + /// Just for all security + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::tick - " + "Error: Unexpected and unknown exception caught\n")); + } + } + // Component attributes and port operations. + + char* + Receiver_exec_i::strategy (void) + { + return ::CORBA::string_dup (this->strategy_); + } + + void + Receiver_exec_i::strategy (const char* strategy) + { + this->strategy_ = ::CORBA::string_dup (strategy); + } + + // Operations from Components::SessionComponent. + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::CCM_Receiver_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::configuration_complete (void) + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::configuration_complete \n ")); + /// No need to implement anything + } + + void + Receiver_exec_i::ccm_activate (void) + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate \n ")); + /// No need to implement anything + /// Start the timer . + if (this->reactor ()->schedule_timer( + this->hello_generator_, // The callback object + 0, // No arguments for this callback + ACE_Time_Value (1, 0), // Initial delay + this->interval_) == -1) // Time interval + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_activate - " + "Error scheduling timer\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - " + "Hello generator is running\n")); + } + } + + void + Receiver_exec_i::ccm_passivate (void) + { + /// No need to implement anything + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate \n ")); + this->reactor ()->cancel_timer (this->hello_generator_); + } + + void + Receiver_exec_i::ccm_remove (void) + { + /// No need to implement anything + ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove \n ")); + delete this->hello_generator_; + } + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Receiver_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Receiver_exec_i); + + return retval; + } +} diff --git a/CIAO/tests/Collocation/Receiver/Receiver_exec.h b/CIAO/tests/Collocation/Receiver/Receiver_exec.h new file mode 100644 index 00000000000..f307546bd6b --- /dev/null +++ b/CIAO/tests/Collocation/Receiver/Receiver_exec.h @@ -0,0 +1,105 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CIAO_RECEIVER_EXEC_0HSO8P_H_ +#define CIAO_RECEIVER_EXEC_0HSO8P_H_ + +#include /**/ "ace/pre.h" + +#include "ReceiverEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Receiver_exec_export.h" +#include "tao/LocalObject.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_Receiver_Impl +{ + // Forward declaration + class Receiver_exec_i; + + /** + * HelloGenerator + */ + class HelloGenerator : + public ACE_Event_Handler + { + public: + HelloGenerator (Receiver_exec_i &callback); + + //Callback from the reactor. + virtual int handle_timeout (const ACE_Time_Value &tv, + const void *arg); + private: + Receiver_exec_i &generator_; + }; + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + class Receiver_exec_i + : public virtual Receiver_Exec, + public virtual ::CORBA::LocalObject + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + /** @name Supported operations and attributes. */ + //@{ + //@} + + /** @name Component attributes and port operations. */ + //@{ + //@} + + /** @name Operations from Components::SessionComponent. */ + //@{ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + /** @name User defined public operations. */ + //@{ + void tick (void); + + char* + strategy (void); + + void + strategy (const char* strategy); + //@} + + private: + ::CCM_Receiver_Context_var ciao_context_; + + /** @name Component attributes. */ + + /** @name User defined members. */ + //@{ + //@} + + /** @name User defined private operations. */ + //@{ + HelloGenerator * hello_generator_; + ACE_Time_Value interval_; + ::CORBA::String_var strategy_; + ACE_Reactor* reactor (void); + //@} + }; + + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Receiver_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/tests/Collocation/Sender/Sender.idl b/CIAO/tests/Collocation/Sender/Sender.idl new file mode 100644 index 00000000000..ecc70bff6c8 --- /dev/null +++ b/CIAO/tests/Collocation/Sender/Sender.idl @@ -0,0 +1,13 @@ +// $Id$ +#ifndef SENDER_IDL_ +#define SENDER_IDL_ + +#include <Components.idl> + +#include "Coll_Base/Base.idl" + +component Sender { + provides Hello hello; +}; + +#endif /* SENDER_IDL_ */ diff --git a/CIAO/tests/Collocation/Sender/Sender.mpc b/CIAO/tests/Collocation/Sender/Sender.mpc new file mode 100644 index 00000000000..efc59e6dcc9 --- /dev/null +++ b/CIAO/tests/Collocation/Sender/Sender.mpc @@ -0,0 +1,141 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p Base -e -I .. -l ../lib -o ../lib Sender" + +project(CollBase_Sender_idl_gen) : componentidldefaults { + custom_only = 1 + + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + -Wb,stub_export_include=Sender_stub_export.h \ + -Wb,skel_export_macro=SENDER_SVNT_Export \ + -Wb,skel_export_include=Sender_svnt_export.h \ + -Wb,exec_export_macro=SENDER_EXEC_Export \ + -Wb,exec_export_include=Sender_exec_export.h \ + -Gxhex -Gxhsk -Gxhst -I .. + + IDL_Files { + Sender.idl + } +} + +project(CollBase_Sender_lem_gen) : ciaoidldefaults { + after += CollBase_Sender_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ + -Wb,stub_export_include=Sender_lem_stub_export.h \ + -SS -Gxhst -I .. + + IDL_Files { + SenderE.idl + } +} + +project(CollBase_Sender_lem_stub) : ccm_svnt { + after += CollBase_Sender_lem_gen CollBase_Sender_stub CollBase_stub CollBase_lem_stub + libs += CollBase_stub CollBase_lem_stub Sender_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sender_lem_stub + dynamicflags += SENDER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + SenderEC.cpp + } + + Header_Files { + SenderEC.h + Sender_lem_stub_export.h + } + + Inline_Files { + SenderEC.inl + } +} + +project(CollBase_Sender_stub) : ccm_stub { + after += CollBase_Sender_idl_gen CollBase_stub CollBase_lem_stub + libs += CollBase_stub CollBase_lem_stub + includes += .. + libpaths += ../lib + libout = ../lib + sharedname = Sender_stub + dynamicflags += SENDER_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + SenderC.cpp + } + + Header_Files { + SenderC.h + Sender_stub_export.h + } + + Inline_Files { + SenderC.inl + } +} + +project(CollBase_Sender_exec) : ciao_executor { + after += CollBase_lem_stub CollBase_Sender_lem_stub CollBase_Sender_stub + sharedname = Sender_exec + libs += CollBase_lem_stub Sender_stub Sender_lem_stub CollBase_stub CollBase_lem_stub + includes += .. + libpaths += ../lib + libout = ../lib + dynamicflags += SENDER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Sender_exec.cpp + } + + Header_Files { + Sender_exec.h + Sender_exec_export.h + } + + Inline_Files { + } +} + + +project(CollBase_Sender_svnt) : ciao_servant { + after += CollBase_skel CollBase_lem_stub CollBase_Sender_lem_stub + sharedname = Sender_svnt + libs += Sender_stub Sender_lem_stub \ + CollBase_skel \ + CollBase_stub \ + CollBase_lem_stub + includes += .. + libpaths += ../lib + libout = ../lib + dynamicflags += SENDER_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + SenderS.cpp + Sender_svnt.cpp + } + + Header_Files { + SenderS.h + Sender_svnt.h + Sender_svnt_export.h + } + + Inline_Files { + SenderS.inl + } +} + + diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.cpp b/CIAO/tests/Collocation/Sender/Sender_exec.cpp new file mode 100644 index 00000000000..95310c3b1d8 --- /dev/null +++ b/CIAO/tests/Collocation/Sender/Sender_exec.cpp @@ -0,0 +1,185 @@ +// -*- C++ -*- +// $Id$ + +#include "Sender_exec.h" + +namespace CIAO_Sender_Impl +{ + /** + * Facet Executor Implementation Class: hello_exec_i + */ + hello_exec_i::hello_exec_i (::CCM_Sender_Context_ptr ctx) + : ciao_context_ (::CCM_Sender_Context::_duplicate (ctx)) + { + } + + hello_exec_i::~hello_exec_i (void) + { + } + + // Operations from ::Hello + void + hello_exec_i::set_point (const pointer_id &p, const char * strat) + { + CORBA::Boolean coll = false; + +#if !defined (CCM_DIRECTCOLL) + ACE_DEBUG ((LM_DEBUG, + "SENDER: hello_exec_i::set_point pointer" + "Strategy desired <%C>, but no collocation " + "because CIAO not build with " + "ccm_direct_collocation = 1.\n", + strat)); +#else + if ((ACE_OS::strcmp("direct", strat) == 0) || + (ACE_OS::strcmp("best", strat) == 0)) + coll = true; + else if (ACE_OS::strcmp("no_collocation", strat) == 0) + coll = false; + else + ACE_ERROR ((LM_DEBUG, "Error: hello_exec_i::set_point - " + "Unexpected strategy <%C> \n", + strat)); +#endif + ACE_DEBUG ((LM_DEBUG, + "SENDER: hello_exec_i::set_point pointer <%@>\n", + (void *)&p)); + + CORBA::Long ptr_nmb = (long)&p; + if (coll) + { + + // In case of collocation pointer p is still the same pointer + // as at the point where poiner p was generated. + // Direct or thru_poa collocation, but thru_poa collocation is disabled, + // so remains direct . + if (ptr_nmb == p.point) + { + ACE_DEBUG ((LM_DEBUG, + "hello_exec_i::set_point - current pointer <%u> " + " is same as starting pointer <%u>," + " direct collocation! \n", + ptr_nmb, p.point)); + } + else + { + ACE_ERROR ((LM_ERROR, + "Error: hello_exec_i::set_point - current pointer <%u> " + " is not the same as starting pointer <%u>" + ", No Collocation\n", + ptr_nmb, p.point)); + } + } + else + { + if (ptr_nmb == p.point) + { + ACE_ERROR (( + LM_DEBUG, + "Error: hello_exec_i::set_point - current pointer <%u> " + " is the same as starting pointer <%u>" + ", Unexpected collocation\n", + ptr_nmb, p.point)); + } + else + { + ACE_DEBUG ((LM_DEBUG, + "hello_exec_i::set_point - current pointer <%u>" + " is not the same as starting pointer <%u>," + " No collocation, as expected ! \n", + ptr_nmb, p.point)); + } + } + } + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + Sender_exec_i::Sender_exec_i (void) + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::Sender_exec_i \n ")); + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + + // Component attributes and port operations. + ::CCM_Hello_ptr + Sender_exec_i::get_hello (void) + { + if ( ::CORBA::is_nil (this->ciao_hello_.in ())) + { + hello_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + hello_exec_i ( + this->ciao_context_.in ()), + ::CCM_Hello::_nil ()); + + this->ciao_hello_ = tmp; + } + + return + ::CCM_Hello::_duplicate ( + this->ciao_hello_.in ()); + } + + + // Operations from Components::SessionComponent. + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context \n ")); + + this->ciao_context_ = + ::CCM_Sender_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::configuration_complete (void) + { + /* Your code here. */ + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::configuration_complete \n ")); + + } + + void + Sender_exec_i::ccm_activate (void) + { + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_activate \n ")); + /// Start the timer . + } + + void + Sender_exec_i::ccm_passivate (void) + { + } + + void + Sender_exec_i::ccm_remove (void) + { + /* Your code here. */ + ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_remove \n ")); + } + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Sender_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Sender_exec_i); + + return retval; + } +} diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.h b/CIAO/tests/Collocation/Sender/Sender_exec.h new file mode 100644 index 00000000000..f127fa5d916 --- /dev/null +++ b/CIAO/tests/Collocation/Sender/Sender_exec.h @@ -0,0 +1,131 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_SENDER_EXEC_SV8KRD_H_ +#define CIAO_SENDER_EXEC_SV8KRD_H_ + +#include /**/ "ace/pre.h" + +#include "SenderEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Sender_exec_export.h" +#include "tao/LocalObject.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + + +#include <map> + +namespace CIAO_Sender_Impl +{ + //Forward declaration + class Sender_exec_i; + + /** + * Provider Executor Implementation Class: hello_exec_i + */ + + class hello_exec_i + : public virtual ::CCM_Hello, + public virtual ::CORBA::LocalObject + { + public: + hello_exec_i (::CCM_Sender_Context_ptr ctx); + virtual ~hello_exec_i (void); + + /** @name Operations and attributes from Hello */ + //@{ + virtual + void set_point (const pointer_id & , const char *); + + //@} + + private: + ::CCM_Sender_Context_var ciao_context_; + }; + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + + class Sender_exec_i + : public virtual Sender_Exec, + public virtual ::CORBA::LocalObject + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + /** @name Supported operations and attributes. */ + //@{ + + //@} + + /** @name Component attributes and port operations. */ + //@{ + + virtual ::CCM_Hello_ptr + get_hello (void); + //@} + + /** @name Operations from Components::SessionComponent. */ + //@{ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + /** @name User defined public operations. */ + //@{ + //@} + + private: + ::CCM_Sender_Context_var ciao_context_; + + /** @name Component attributes. */ + //@{ + ::CCM_Hello_var ciao_hello_; + + //@} + + /** @name User defined members. */ + //@{ + //@} + }; + + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Sender_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/tests/Collocation/descriptors/PlanAllOnMore.cdp b/CIAO/tests/Collocation/descriptors/PlanAllOnMore.cdp new file mode 100644 index 00000000000..a53d5516ca9 --- /dev/null +++ b/CIAO/tests/Collocation/descriptors/PlanAllOnMore.cdp @@ -0,0 +1,252 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>RDBaseTest</label> + <UUID>RDBaseTest</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + +<implementation xmi:id="SenderImpl"> + <name>SenderImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ReceiverImpl"> + <name>ReceiverImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="CompSvr1Inst"> + <name>ComponentServer1Instance</name> + <node>One</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <!--string>-ORBCollocation global -ORBCollocationStrategy thru_poa</string--> + <!--string>-ORBCollocation global -ORBCollocationStrategy direct</string--> + <string>-ORBCollocation global -ORBCollocationStrategy best</string> + <!--string>-ORBCollocation no</string--> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderInstance"> + <name>Sender</name> + <node>One</node> + <source/> + <implementation xmi:idref="SenderImpl" /> + </instance> + + <instance xmi:id="ReceiverInstance"> + <name>Receiver</name> + <node>One</node> + <source/> + <implementation xmi:idref="ReceiverImpl" /> + <configProperty> + <name>strategy</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>no_collocation</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>hello_connection</name> + <internalEndpoint> + <portName>hello_to_rec</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>hello</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + </connection> + + <!--connection> + <name>bye_connection</name> + <internalEndpoint> + <portName>bye</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>bye_from_rec</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + </connection--> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvr1Inst" /> + <constrainedInstance xmi:idref="SenderInstance" /> + <!--constrainedInstance xmi:idref="ReceiverInstance" /--> + </localityConstraint> + <localityConstraint> + <constraint>DifferentProcess</constraint> + <constrainedInstance xmi:idref="SenderInstance" /> + <constrainedInstance xmi:idref="ReceiverInstance" /> + </localityConstraint> + +</Deployment:DeploymentPlan> diff --git a/CIAO/tests/Collocation/descriptors/PlanAllOnOne.cdp b/CIAO/tests/Collocation/descriptors/PlanAllOnOne.cdp new file mode 100644 index 00000000000..697c6b75cf3 --- /dev/null +++ b/CIAO/tests/Collocation/descriptors/PlanAllOnOne.cdp @@ -0,0 +1,246 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>RDBaseTest</label> + <UUID>RDBaseTest</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + +<implementation xmi:id="SenderImpl"> + <name>SenderImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ReceiverImpl"> + <name>ReceiverImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="CompSvr1Inst"> + <name>ComponentServer1Instance</name> + <node>One</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-ORBCollocation global -ORBCollocationStrategy direct</string> + <!--string>-ORBCollocation global -ORBCollocationStrategy best</string--> + <!--string>-ORBCollocation no</string--> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderInstance"> + <name>Sender</name> + <node>One</node> + <source/> + <implementation xmi:idref="SenderImpl" /> + </instance> + + <instance xmi:id="ReceiverInstance"> + <name>Receiver</name> + <node>One</node> + <source/> + <implementation xmi:idref="ReceiverImpl" /> + <configProperty> + <name>strategy</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>direct</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>hello_connection</name> + <internalEndpoint> + <portName>hello_to_rec</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>hello</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + </connection> + + <!--connection> + <name>bye_connection</name> + <internalEndpoint> + <portName>bye</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>bye_from_rec</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + </connection--> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvr1Inst" /> + <constrainedInstance xmi:idref="SenderInstance" /> + <constrainedInstance xmi:idref="ReceiverInstance" /> + </localityConstraint> + +</Deployment:DeploymentPlan> diff --git a/CIAO/tests/Collocation/descriptors/PlanAllOnOneBest.cdp b/CIAO/tests/Collocation/descriptors/PlanAllOnOneBest.cdp new file mode 100644 index 00000000000..cf444c2c5aa --- /dev/null +++ b/CIAO/tests/Collocation/descriptors/PlanAllOnOneBest.cdp @@ -0,0 +1,244 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>RDBaseTest</label> + <UUID>RDBaseTest</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + +<implementation xmi:id="SenderImpl"> + <name>SenderImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ReceiverImpl"> + <name>ReceiverImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="CompSvr1Inst"> + <name>ComponentServer1Instance</name> + <node>One</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-ORBCollocation global -ORBCollocationStrategy best</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderInstance"> + <name>Sender</name> + <node>One</node> + <source/> + <implementation xmi:idref="SenderImpl" /> + </instance> + + <instance xmi:id="ReceiverInstance"> + <name>Receiver</name> + <node>One</node> + <source/> + <implementation xmi:idref="ReceiverImpl" /> + <configProperty> + <name>strategy</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>best</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>hello_connection</name> + <internalEndpoint> + <portName>hello_to_rec</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>hello</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + </connection> + + <!--connection> + <name>bye_connection</name> + <internalEndpoint> + <portName>bye</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>bye_from_rec</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + </connection--> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvr1Inst" /> + <constrainedInstance xmi:idref="SenderInstance" /> + <constrainedInstance xmi:idref="ReceiverInstance" /> + </localityConstraint> + +</Deployment:DeploymentPlan> diff --git a/CIAO/tests/Collocation/descriptors/PlanAllOnOneNo.cdp b/CIAO/tests/Collocation/descriptors/PlanAllOnOneNo.cdp new file mode 100644 index 00000000000..a3f1f341a41 --- /dev/null +++ b/CIAO/tests/Collocation/descriptors/PlanAllOnOneNo.cdp @@ -0,0 +1,244 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>RDBaseTest</label> + <UUID>RDBaseTest</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + +<implementation xmi:id="SenderImpl"> + <name>SenderImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ReceiverImpl"> + <name>ReceiverImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="CompSvr1Inst"> + <name>ComponentServer1Instance</name> + <node>One</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-ORBCollocation no</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderInstance"> + <name>Sender</name> + <node>One</node> + <source/> + <implementation xmi:idref="SenderImpl" /> + </instance> + + <instance xmi:id="ReceiverInstance"> + <name>Receiver</name> + <node>One</node> + <source/> + <implementation xmi:idref="ReceiverImpl" /> + <configProperty> + <name>strategy</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>no_collocation</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>hello_connection</name> + <internalEndpoint> + <portName>hello_to_rec</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>hello</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + </connection> + + <!--connection> + <name>bye_connection</name> + <internalEndpoint> + <portName>bye</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>bye_from_rec</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + </connection--> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvr1Inst" /> + <constrainedInstance xmi:idref="SenderInstance" /> + <constrainedInstance xmi:idref="ReceiverInstance" /> + </localityConstraint> + +</Deployment:DeploymentPlan> diff --git a/CIAO/tests/Collocation/descriptors/PlanAllOnOneNoTP.cdp b/CIAO/tests/Collocation/descriptors/PlanAllOnOneNoTP.cdp new file mode 100644 index 00000000000..d33f2328771 --- /dev/null +++ b/CIAO/tests/Collocation/descriptors/PlanAllOnOneNoTP.cdp @@ -0,0 +1,244 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>RDBaseTest</label> + <UUID>RDBaseTest</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + +<implementation xmi:id="SenderImpl"> + <name>SenderImplementation</name> + <source/> + <artifact xmi:idref="Sender_ExecArtifact" /> + <artifact xmi:idref="Sender_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Sender_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="ReceiverImpl"> + <name>ReceiverImplementation</name> + <source/> + <artifact xmi:idref="Receiver_ExecArtifact" /> + <artifact xmi:idref="Receiver_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Receiver_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="CompSvr1Inst"> + <name>ComponentServer1Instance</name> + <node>One</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>-ORBCollocation global -ORBCollocationStrategy thru_poa</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="SenderInstance"> + <name>Sender</name> + <node>One</node> + <source/> + <implementation xmi:idref="SenderImpl" /> + </instance> + + <instance xmi:id="ReceiverInstance"> + <name>Receiver</name> + <node>One</node> + <source/> + <implementation xmi:idref="ReceiverImpl" /> + <configProperty> + <name>strategy</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>no_thru_poa</string> + </value> + </value> + </configProperty> + </instance> + + <connection> + <name>hello_connection</name> + <internalEndpoint> + <portName>hello_to_rec</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>hello</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + </connection> + + <!--connection> + <name>bye_connection</name> + <internalEndpoint> + <portName>bye</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SenderInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>bye_from_rec</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="ReceiverInstance" /> + </internalEndpoint> + </connection--> + + <artifact xmi:id="Sender_ExecArtifact"> + <name>Sender_exec</name> + <source/> + <node/> + <location>Sender_exec</location> + </artifact> + <artifact xmi:id="Sender_SvntArtifact"> + <name>Sender_svnt</name> + <source/> + <node/> + <location>Sender_svnt</location> + </artifact> + + <artifact xmi:id="Receiver_ExecArtifact"> + <name>Receiver_exec</name> + <source/> + <node/> + <location>Receiver_exec</location> + </artifact> + <artifact xmi:id="Receiver_SvntArtifact"> + <name>Receiver_svnt</name> + <source/> + <node/> + <location>Receiver_svnt</location> + </artifact> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvr1Inst" /> + <constrainedInstance xmi:idref="SenderInstance" /> + <constrainedInstance xmi:idref="ReceiverInstance" /> + </localityConstraint> + +</Deployment:DeploymentPlan> diff --git a/CIAO/tests/Collocation/descriptors/run_test.pl b/CIAO/tests/Collocation/descriptors/run_test.pl new file mode 100755 index 00000000000..4d986a2291b --- /dev/null +++ b/CIAO/tests/Collocation/descriptors/run_test.pl @@ -0,0 +1,263 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +#$ENV{'DANCE_LOG_LEVEL'}=9; +$ENV{'CIAO_LOG_LEVEL'}=1; +#$ENV{'TAO_orbdebug'}=2; +#$ENV{'DANCE_TRACE_ENABLE'}=1; +#$ENV{'CIAO_TRACE_ENABLE'}=1; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60010 ); +@iorbases = ( "NodeApp1.ior" ); +@iorfiles = 0; +@nodenames = ( "One" ); + + +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "PlanAllOnOne.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService "; + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +if ($#ARGV == -1) { + opendir(DIR, "."); + @files = grep(/\.cdp$/,readdir(DIR)); + closedir(DIR); +} +else { + @files = @ARGV; +} + +create_targets (); +init_ior_files (); + +foreach $file (@files) { + print "Starting test for deployment $file\n"; + + # Invoke naming service + + $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + + $ns_status = $NS->Spawn (); + + if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; + } + + print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + + if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; + } + + $ns_running = 1; + # Set up NamingService environment + $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + + # Invoke node daemon. + print "Invoking node daemon\n"; + $status = run_node_daemons (); + + if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; + } + + $daemons_running = 1; + + # Invoke execution manager. + print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; + $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); + $em_status = $EM->Spawn (); + + if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; + } + + if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; + } + + $em_running = 1; + + # Invoke executor - start the application -. + print "Invoking executor - launch the application -\n"; + + print "Start dance_plan_launcher.exe with -x $file -k file://$ior_emfile\n"; + $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $file -k file://$ior_emfile -l"); + $pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + + if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; + } + + for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } + } + + sleep (15); + + # Invoke executor - stop the application -. + print "Invoking executor - shutting down -\n"; + print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $file\n"; + + $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $file -s"); + $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + + if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; + } + + delete_ior_files (); + kill_open_processes (); + # Sleep for a couple seconds to make sure everything has a chance to shut down. + sleep 5; +} +delete_ior_files (); +kill_open_processes (); + + +exit $status; diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp index ca344c6ab33..ede38ef5a5b 100644 --- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp +++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser_exec.cpp @@ -2,6 +2,7 @@ #include "SimpleMultipleUser_exec.h" #include "ace/Log_Msg.h" +#include "ciao/Logger/Log_Macros.h" namespace CIAO_Simple_SimpleMultipleUser_Impl { @@ -98,7 +99,22 @@ namespace CIAO_Simple_SimpleMultipleUser_Impl SimpleMultipleUser_exec_i::ccm_remove () { ACE_TRACE ("SimpleMultipleUser_exec_i::ccm_remove ()"); - // Your code here. + //TODO: Enable this check again and resolve underlying issues. +/* + ::Simple::SimpleMultipleUser::trig_uses_mConnections_var conns = + this->context_->get_connections_trig_uses_m (); + if (conns->length() != 0) + { + ACE_ERROR ((LM_ERROR, CLINFO "SimpleMultipleUser_exec_i::ccm_remove - " + "ERROR: Connections still exists on exit - <%u> %@\n", + conns->length(), this)); + } + else + { + ACE_DEBUG ((LM_DEBUG, CLINFO "SimpleMultipleUser_exec_i::ccm_remove - " + "OK: Connections do not exist on exit %@\n", this)); + } +*/ } //================================================================== diff --git a/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt b/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt index 1f648916972..ae017c0a1d2 100644 --- a/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt +++ b/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt @@ -1,3 +1,4 @@ +$Id$ This script tests redeployment of plans after initial launch failures. Each test uses 2 descriptors; the first with a configured launch failure diff --git a/CIAO/tests/DAnCE/EM-Redeployment/README.txt b/CIAO/tests/DAnCE/EM-Redeployment/README.txt index 3b493a445d0..be557ec5d11 100644 --- a/CIAO/tests/DAnCE/EM-Redeployment/README.txt +++ b/CIAO/tests/DAnCE/EM-Redeployment/README.txt @@ -1,3 +1,4 @@ +$Id$ This script tests redeployment of plans in 'normal' (i.e. non-failure) situations. diff --git a/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt b/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt index b755e62ce8d..5a4cbf8ee5a 100644 --- a/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt +++ b/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt @@ -1,3 +1,4 @@ +$Id$ This script tests redeployment of plans after shutdown failures. Each test uses 2 descriptors; the first with a configured shutdown failure diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl index 5f996ff9791..8e87d6d9481 100755 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test.pl @@ -12,7 +12,7 @@ $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; $DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; -$ENV{'CIAO_LOG_LEVEL'}=1; +$ENV{'CIAO_LOG_LEVEL'}= $ENV{'CIAO_LOG_LEVEL'} || 1; $daemons_running = 0; $em_running = 0; diff --git a/CIAO/tests/DAnCE/Threading/README b/CIAO/tests/DAnCE/Threading/README index 8228e49910a..d9f04fffe48 100644 --- a/CIAO/tests/DAnCE/Threading/README +++ b/CIAO/tests/DAnCE/Threading/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ This test is there to experiment with the TAO/CORBA settings. diff --git a/CIAO/tests/IDL3/Connectors/README.txt b/CIAO/tests/IDL3/Connectors/README.txt index 591d6ec8066..056d4f2d38c 100644 --- a/CIAO/tests/IDL3/Connectors/README.txt +++ b/CIAO/tests/IDL3/Connectors/README.txt @@ -1,3 +1,3 @@ -// $Id$ +$Id$ This test validates whether a connector can't have a consumes diff --git a/CIAO/tests/IDL3/Events/Any/README b/CIAO/tests/IDL3/Events/Any/README index 7bf91be5776..6383ce4a502 100644 --- a/CIAO/tests/IDL3/Events/Any/README +++ b/CIAO/tests/IDL3/Events/Any/README @@ -1,3 +1,4 @@ +$Id$ Event Any Test ======================= diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/README b/CIAO/tests/IDL3/ImpliedIDL/All/README index 2f4e09eaf3c..765fb628bc3 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/All/README +++ b/CIAO/tests/IDL3/ImpliedIDL/All/README @@ -1,6 +1,8 @@ +$Id$ + Converting IDL3 to IDL2 ======================= - + Introduction ============ @@ -20,7 +22,7 @@ would have been generated in one step by a CCM-aware IDL compiler. The tao_idl3_to_idl2 executable itself is built in CIAO_ROOT/tools/IDL3_to_IDL2. It uses the TAO IDL compiler front end parsing engine and the TAO IDL compiler driver -files, so it depends on ACE. The IDL generation is +files, so it depends on ACE. The IDL generation is accomplished by a custom backend library. Other Features Tested @@ -73,7 +75,7 @@ order of execution. 2. The -Sm option passed to the IDL compiler must be used when processing an IDL file resulting from the execution of -tao_idl3_to_idl2. This option disables the action of the +tao_idl3_to_idl2. This option disables the action of the tao_idl backend 'preprocessor' (which is 'on' by default) that adds implied IDL nodes to the Abstract Syntax Tree for subsequent C++ code generation. In the case of an eventtype, diff --git a/CIAO/tests/IDL3/Lookup/README b/CIAO/tests/IDL3/Lookup/README index a92531070a6..e5b101504ba 100644 --- a/CIAO/tests/IDL3/Lookup/README +++ b/CIAO/tests/IDL3/Lookup/README @@ -1,3 +1,4 @@ +$Id$ Lookup Test ======================= diff --git a/CIAO/tests/IDL3_to_XMI/Forward_Declared/README b/CIAO/tests/IDL3_to_XMI/Forward_Declared/README index 40a3dd0e71f..8516cda231b 100644 --- a/CIAO/tests/IDL3_to_XMI/Forward_Declared/README +++ b/CIAO/tests/IDL3_to_XMI/Forward_Declared/README @@ -1,4 +1,4 @@ -// $Id$ +$Id$ According to the original report c_ok.idl compiled fine and c_nok.idl didn't compile. After this is fixed both of the files diff --git a/CIAO/tests/IDL_Test/Cornucopia/README b/CIAO/tests/IDL_Test/Cornucopia/README index 40c1b6a9090..193454ab11d 100644 --- a/CIAO/tests/IDL_Test/Cornucopia/README +++ b/CIAO/tests/IDL_Test/Cornucopia/README @@ -1,3 +1,4 @@ +$Id$ Cornucopia Code Generation Test =============================== @@ -11,7 +12,7 @@ constructs, and some features not yet present in other CIAO tests and examples: Non-template IDL3+ - + - porttype - port - mirrorport @@ -23,17 +24,17 @@ not yet present in other CIAO tests and examples: - supported interfaces - homes - components (attributes only) - + - inheritance of factory and finder operations - raises, getraises and setraises constructs - separate scoping for supported interfaces, port interfaces, derived components, and homes - + - skeleton and servant generated files in separate builds/libraries - - + + Jeff Parsons December 17, 2009 diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/README b/CIAO/tests/IDL_Test/IDL3_Plus/README index 73e6bf65d20..976a1fe33a5 100644 --- a/CIAO/tests/IDL_Test/IDL3_Plus/README +++ b/CIAO/tests/IDL_Test/IDL3_Plus/README @@ -1,3 +1,4 @@ +$Id$ KitchenSink Code Generation Test =============================== diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl new file mode 100644 index 00000000000..7eaae4f5743 --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.idl @@ -0,0 +1,37 @@ +// $Id$ + +#ifndef BASE_IDL +#define BASE_IDL + +#include <Components.idl> + +#pragma ciao lem "BaseE.idl" + +module Inherited +{ + interface base_interface { + void do_base (); + + attribute string str_base_interface; + }; + + // TODO: derive this interface from a base interface... + interface derived_interface { + void do_derived (); + + readonly attribute string str_derived_interface; + }; +}; + +module Inherited +{ + component Base_comp + { + provides Inherited::base_interface prov_base; + uses Inherited::base_interface uses_base; + + attribute long base; + }; +}; + +#endif diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc new file mode 100644 index 00000000000..f61c1cff337 --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc @@ -0,0 +1,127 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl Base" + +project(Base_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=BASE_STUB_Export \ + -Wb,stub_export_include=Base_stub_export.h \ + -Wb,skel_export_macro=BASE_SVNT_Export \ + -Wb,skel_export_include=Base_svnt_export.h \ + -Wb,exec_export_macro=BASE_EXEC_Export \ + -Wb,exec_export_include=Base_exec_export.h \ + -Gex + + IDL_Files { + Base.idl + } +} + +project(Base_lem_gen) : ciaoidldefaults { + after += Base_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=BASE_LEM_STUB_Export \ + -Wb,stub_export_include=Base_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + BaseE.idl + } +} + +project(Base_lem_stub) : ccm_svnt { + after += Base_lem_gen Base_stub + libs += Base_stub + + sharedname = Base_lem_stub + dynamicflags += BASE_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseEC.cpp + } + + Header_Files { + BaseEC.h + Base_lem_stub_export.h + } + + Inline_Files { + BaseEC.inl + } +} + +project(Base_stub) : ccm_stub { + after += Base_idl_gen + libs += + + sharedname = Base_stub + dynamicflags += BASE_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseC.cpp + } + + Header_Files { + BaseC.h + Base_stub_export.h + } + + Inline_Files { + BaseC.inl + } +} + +project(Base_exec) : ciao_executor { + after += Base_lem_stub Base_stub + sharedname = Base_exec + libs += Base_stub Base_lem_stub + + dynamicflags += BASE_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Base_exec.cpp + } + + Header_Files { + Base_exec.h + Base_exec_export.h + } + + Inline_Files { + } +} + + +project(Base_svnt) : ciao_servant { + after += Base_lem_stub + sharedname = Base_svnt + libs += Base_stub Base_lem_stub + + dynamicflags += BASE_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseS.cpp + Base_svnt.cpp + } + + Header_Files { + BaseS.h + Base_svnt.h + Base_svnt_export.h + } + + Inline_Files { + BaseS.inl + } +} diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl new file mode 100644 index 00000000000..e409001b64a --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.idl @@ -0,0 +1,32 @@ +// $Id$ + +#ifndef DERIVED_IDL +#define DERIVED_IDL + +#include <Components.idl> + +#include "Base.idl" + +#pragma ciao lem "DerivedE.idl" + +module Inherited +{ + interface Tester + { + void set_long_base (in long base); + long get_long_base (); + + void set_long_derived (in long derived); + long get_long_derived (); + }; + + component Derived_comp : Inherited::Base_comp supports Inherited::Tester + { + provides Inherited::derived_interface prov_derived; + uses Inherited::derived_interface uses_derived; + + attribute long derived; + }; +}; + +#endif diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc new file mode 100644 index 00000000000..6d4d8337d77 --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc @@ -0,0 +1,162 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p IhC_Foo Derived" + +project(Base_Derived_idl_gen) : componentidldefaults { + custom_only = 1 + after += Base_idl_gen + idlflags += -Wb,stub_export_macro=DERIVED_STUB_Export \ + -Wb,stub_export_include=Derived_stub_export.h \ + -Wb,skel_export_macro=DERIVED_SVNT_Export \ + -Wb,skel_export_include=Derived_svnt_export.h \ + -Wb,exec_export_macro=DERIVED_EXEC_Export \ + -Wb,exec_export_include=Derived_exec_export.h \ + -Gex + + IDL_Files { + Derived.idl + } +} + +project(Base_Derived_lem_gen) : ciaoidldefaults { + after += Base_Derived_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=DERIVED_LEM_STUB_Export \ + -Wb,stub_export_include=Derived_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + DerivedE.idl + } +} + +project(Base_Derived_lem_stub) : ccm_svnt { + after += Base_Derived_lem_gen \ + Base_Derived_stub \ + Base_stub \ + Base_lem_stub + libs += Base_stub \ + Base_lem_stub \ + Derived_stub + + sharedname = Derived_lem_stub + dynamicflags += DERIVED_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DerivedEC.cpp + } + + Header_Files { + DerivedEC.h + Derived_lem_stub_export.h + } + + Inline_Files { + DerivedEC.inl + } +} + +project(Base_Derived_stub) : ccm_stub { + after += Base_Derived_idl_gen Base_stub + libs += Base_stub + + sharedname = Derived_stub + dynamicflags += DERIVED_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DerivedC.cpp + } + + Header_Files { + DerivedC.h + Derived_stub_export.h + } + + Inline_Files { + DerivedC.inl + } +} + +project(Base_Derived_exec) : ciao_executor { + after += Base_Derived_lem_stub \ + Base_Derived_stub \ + Base_exec + sharedname = Derived_exec + libs += Derived_stub \ + Derived_lem_stub \ + Base_stub \ + Base_lem_stub \ + Base_exec + + dynamicflags += DERIVED_EXEC_BUILD_DLL BASE_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Derived_exec.cpp + } + + Header_Files { + Derived_exec.h + Derived_exec_export.h + } + + Inline_Files { + } +} + + +project(Base_Derived_svnt) : ciao_servant { + after += Base_svnt Base_Derived_lem_stub + sharedname = Derived_svnt + libs += Derived_stub \ + Derived_lem_stub \ + Base_stub \ + Base_lem_stub \ + Base_svnt + + dynamicflags += DERIVED_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DerivedS.cpp + Derived_svnt.cpp + } + + Header_Files { + DerivedS.h + Derived_svnt.h + Derived_svnt_export.h + } + + Inline_Files { + DerivedS.inl + } +} + +project (Derived_Tester) : ccm_stub, valuetype { + exename = Tester + after += Base_Derived_stub + libs += Derived_stub Base_stub + + IDL_Files { + } + + Source_Files { + Tester.cpp + } + + Header_Files { + } + + Inline_Files { + } +} diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp new file mode 100644 index 00000000000..cfde3670c43 --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp @@ -0,0 +1,81 @@ +//$Id$ +/* + * @file Tester.cpp + * + * @author Marcel Smit + */ + + +#include "DerivedC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *tester_ior = ACE_TEXT ("file://Derived.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + tester_ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Derived IOR> (default is file://Derived.ior)\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var tester_obj = + orb->string_to_object (tester_ior); + + // downcast the object reference to the appropriate type + ::Inherited::Tester_var tester = + ::Inherited::Tester::_narrow (tester_obj.in ()); + + if (CORBA::is_nil (tester.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to acquire 'Tester' objref\n"), + -1); + } + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the Tester?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc index c314053ebd6..e6223176d1b 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc +++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc @@ -60,7 +60,7 @@ project(IhC_Foo_IhC_Bar_lem_stub) : ccm_svnt { project(IhC_Foo_IhC_Bar_stub) : ccm_stub { after += IhC_Foo_IhC_Bar_idl_gen IhC_Foo_stub - libs += IhC_Foo_stub + libs += IhC_Foo_stub sharedname = IhC_Bar_stub dynamicflags += IHC_BAR_STUB_BUILD_DLL @@ -93,7 +93,7 @@ project(IhC_Foo_IhC_Bar_exec) : ciao_executor { IhC_Foo_lem_stub \ IhC_Foo_exec - dynamicflags += IHC_BAR_EXEC_BUILD_DLL + dynamicflags += IHC_BAR_EXEC_BUILD_DLL IHC_FOO_EXEC_BUILD_DLL IDL_Files { } diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/README b/CIAO/tests/IDL_Test/Reused_Facet_Interface/README index b25ef8cfd1a..d884eef7a1f 100644 --- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/README +++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/README @@ -1,3 +1,4 @@ +$Id$ Reused Facet Interface Test =========================== diff --git a/CIAO/tests/Thread/README.txt b/CIAO/tests/Thread/README.txt index bd786460b59..4f26cb53fcd 100644 --- a/CIAO/tests/Thread/README.txt +++ b/CIAO/tests/Thread/README.txt @@ -1,3 +1,3 @@ -// $Id$ +$Id$ This test validates that all ccm callbacks and creation/deletion on a user component happen on the same ccm thread diff --git a/CIAO/tools/IDL3_to_IDL2/README b/CIAO/tools/IDL3_to_IDL2/README index b0732e2c304..dc53b2b45ff 100644 --- a/CIAO/tools/IDL3_to_IDL2/README +++ b/CIAO/tools/IDL3_to_IDL2/README @@ -1,3 +1,4 @@ +$Id$ IDL3 To IDL2 Converter @@ -39,7 +40,7 @@ option takes effect only if foo.idl contains no 'IDL3' declarations, otherwise it's a no-op. Note that the original -x <filename> option (which manually excludes -an included IDL file from being transformed to an include of the +an included IDL file from being transformed to an include of the '_IDL2' decorated corresponding file) has been eliminated. This option was intended for included IDL files that contained no IDL3 constructs, and therefore didn't need processing by this tool. @@ -106,20 +107,20 @@ interface Bar : Components::CCMObject Foo objref; Components::Cookie ck; }; - + typedef sequence<needs_fooConnection> needs_fooConnections; - + Components::Cookie connect_needs_foo (in Foo connection) raises (Components::ExceededConnectionLimit, Components::InvalidConnection); - + Foo disconnect_needs_foo (in Components::Cookie ck) raises (Components::InvalidConnection); - + needs_fooConnections get_connections_needs_foo (); - + Components::Cookie subscribe_ev_pub (in EvConsumer consumer) raises (Components::ExceededConnectionLimit); - + EvConsumer unsubscribe_ev_pub (in Components::Cookie ck) raises (Components::InvalidConnection); }; @@ -134,7 +135,7 @@ interface BarHomeImplicit : Components::KeylessCCMHome raises (Components::CreateFailure); }; -interface BarHome : BarHomeExplicit, BarHomeImplicit +interface BarHome : BarHomeExplicit, BarHomeImplicit { }; diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index e9f3f404a35..0e4921f8072 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,285 @@ +Wed Nov 02 08:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Thu Oct 27 10:10:00 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * bin/ciao.localityconfig: + + Added CIAO_ReferenceLookup interceptor. + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + + Added collection of connections with exernalReference endpoints + to LocalityManager_i::collect_references (without resolving). + Resolving the references is deferred to be handled in a + deployment interceptor. This allows for more control in the + exact setup of external references without the overhead of + unnecessary/unwanted resolution attempts based on (incorrect) + assumptions of the nature of the external references. + + * dance/Plan_Launcher/Plan_Launcher_Base.h: + * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h: + * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: + + Removed create_external_connections() method. + + Wed Oct 26 10:13:47 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc: + Using the correct dynamic flag now. + + Wed Oct 26 09:44:25 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc: + Merged Will's solution for compile issues on windows. + + === end changelog === + +Tue Nov 1 13:18:21 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + * dance/Plan_Launcher/Plan_Launcher_Base.h: + * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h: + * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: + + Removed create_external_connections and moved functionality into the + LocalityManager. Thanks to Martin Corino <mcorino@remedy.nl> for the + fixes. + +Sun Oct 30 22:42:44 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/ciao.localityconfig: + * dance/LocalityManager/Scheduler/Events/Connect.cpp: + * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: + + Moved name service resolution of external reference endpoints into the + CIAO deployment interceptors. + +Tue Oct 25 17:30:32 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Split_Plan/Split_Plan.cpp: + + Moved openmp for loops inside __OPENMP ifdef, else we use + CORBA::ULong types for loop index. + +Tue Oct 25 17:29:44 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc: + + Added missing dynamicflags directive. + +Sat Oct 22 22:01:01 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h: + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h: + + Export macros. + +Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Thu Oct 13 07:17:02 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * dance/Logger/Log_Macros.h: + Fix complile errors when all logging is disabled. + + Wed Oct 12 13:09:40 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * dance/DAnCE_Core.mpc: + * dance/LocalityManager/Configuration/Configuration.mpc: + * dance/LocalityManager/Interceptors/Error_Interceptors.mpc: + * dance/Plan_Launcher/Daemon/PL_Daemon.mpc: + * tools/Artifact_Installation/Artifact_Installation.mpc: + * tools/Convert_Plan/Convert_Plan.mpc: + * tools/Logger_Backend/ndds/NDDS_Logger.mpc: + * tools/System_Health/Interceptors/SHS_Interceptor.mpc: + * tools/System_Health/System_Health.mpc: + Fixed several install issues. + + === end changelog === + +Thu Oct 20 02:37:36 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Split_Plan/Split_Plan.cpp: + + Warnings. + +Wed Oct 19 19:14:34 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * MPC/config/dance_split_plan.mpb: + * tools/Split_Plan/Split_Plan.h: + * tools/Split_Plan/Split_Plan.cpp: + * tools/Split_Plan/Split_Plan.mpc: + + Added capability to multithread the split plan process with openmp. + +Wed Oct 19 16:30:35 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/DAnCE_Utility.h: + + Add missing export macro. + +Wed Oct 19 05:03:16 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Domain_Validator/Domain_Validator.mpc: + + Attempt at windows compile/linking issue. + +Mon Oct 17 17:27:17 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/Plan_Launcher/Plan_Launcher.mpc: + stab at a static linking problem. + + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp: + + warnings. + +Mon Oct 17 06:15:45 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc: + + Missing from previous commit. + +Fri Oct 14 14:47:22 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * MPC/config/dance_domain_validator.mpb: + + fuzz. + +Fri Oct 14 14:01:41 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * MPC/config/dance_domain_validator.mpb: + + Missing from a previous commit. + +Fri Oct 14 02:31:06 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Domain_Validator/Domain_Validator.idl: + * tools/Domain_Validator/Domain_Validator.mpc: + + Fuzz. + +Thu Oct 13 22:38:44 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/Plan_Launcher/Plan_Launcher.cpp: + * tests/Plan_Launcher/NM-Delay/NodeMap.cdd: + * tests/Plan_Launcher/NM-Delay/run_test.pl: + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp: + + Added capability for the domain validator to check the liveness of the + ExecutionManager. + +Thu Oct 13 22:25:39 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tests/Plan_Launcher/NM-Delay: + * tests/Plan_Launcher/NM-Delay/Deployment.cdp: + * tests/Plan_Launcher/NM-Delay/NodeMap.cdd: + * tests/Plan_Launcher/NM-Delay/run_test.pl: + + Test for the domain validator. + +Thu Oct 13 22:24:56 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/Plan_Launcher/Plan_Launcher.cpp: + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h: + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp: + + Bugfixes. + +Thu Oct 13 22:19:49 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/XMLSchema/id_map.hpp: + * tools/Config_Handlers/XML_File_Intf.cpp: + + 1) the XML_Helper is no longer terminated in the File_Intf destructor, + this caused problems when several files were parsed in a single process. + 2) We now reset the ID_Map before each parsing event. + +Thu Oct 13 19:10:36 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/DAnCE_Utility.h: + * dance/DAnCE_Utility.cpp: + * dance/Plan_Launcher/Plan_Launcher.cpp: + * dance/Plan_Launcher/Plan_Launcher.mpc: + * tools/Domain_Validator: + * tools/Domain_Validator/CORBA: + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h: + * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp: + * tools/Domain_Validator/Domain_Validator.idl: + * tools/Domain_Validator/Domain_Validator.mpc: + + Initial domain validator implementation. + +Thu Oct 13 19:05:45 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/DAnCE_Properties.idl: + + Corrected string literals for identifying CCM instance types. + +Mon Oct 10 08:48:51 CEST 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE version 1.0.5 released. + +Fri Oct 7 10:49:04 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * docs/sources/Error_Documentation.oo3/contents.xml: + Fuzz + +Fri Oct 7 09:46:53 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * docs/DAnCE_Logging.txt: + * docs/LocalityManager-Plugins.txt: + Fuzz. + +Fri Oct 7 09:21:58 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * dance/NodeManager/README: + Fuzz: Id-tags. + +Fri Oct 7 08:02:38 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.h: + Fuzz: Trailing whitespace + + * docs/sources/Error_Documentation.oo3/contents.xml: + Fuzz: No id-tag + +Thu Oct 6 12:37:04 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.h: + * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp: + Fuzz. + +Wed Oct 5 14:32:32 UTC 2011 William R. Otte <wotte@dre.vanderbit.edu> + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp: + + Fuzz. + +Tue Oct 4 19:42:56 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.h: + * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + * dance/LocalityManager/Daemon/Locality_Manager_Task.h: + * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp: + * dance/LocalityManager/Scheduler/Plugin_Manager.h: + * dance/LocalityManager/Scheduler/Plugin_Manager.cpp: + + Resolved some memory leaks in the pugin subsystem. + +Tue Oct 4 14:44:28 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/LocalityManager/Scheduler/Events/Action_Base.cpp: + + Reduce log priority of certain error messages. + Tue Aug 23 18:17:43 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/DAnCE/MPC/config/dance_domain_validator.mpb b/DAnCE/MPC/config/dance_domain_validator.mpb new file mode 100644 index 00000000000..de5ed8af951 --- /dev/null +++ b/DAnCE/MPC/config/dance_domain_validator.mpb @@ -0,0 +1,5 @@ +// $Id$ +project : dance_config_handlers, dance_deployment_stub, dance_stub { + after += DAnCE_Domain_Validator_Base DAnCE_CORBA_Domain_Validator + libs += DAnCE_Domain_Validator_Base DAnCE_CORBA_Domain_Validator +}
\ No newline at end of file diff --git a/DAnCE/MPC/config/dance_split_plan.mpb b/DAnCE/MPC/config/dance_split_plan.mpb index 65a245a0b53..d5032a0ca19 100644 --- a/DAnCE/MPC/config/dance_split_plan.mpb +++ b/DAnCE/MPC/config/dance_split_plan.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : dance, dance_stub, dance_deployment_stub, dance_tools { +project : dance, dance_stub, dance_deployment_stub, dance_tools, openmp { after += DAnCE_Split_Plan_Impl libs += DAnCE_Split_Plan_Impl } diff --git a/DAnCE/NEWS b/DAnCE/NEWS index 1ee6059e88f..7f375a134dc 100644 --- a/DAnCE/NEWS +++ b/DAnCE/NEWS @@ -1,6 +1,11 @@ +USER VISIBLE CHANGES BETWEEN DAnCE-1.0.5 and DAnCE-1.1.0 +======================================================= + USER VISIBLE CHANGES BETWEEN DAnCE-1.0.4 and DAnCE-1.0.5 ======================================================= +. Fixed some memory leaks + USER VISIBLE CHANGES BETWEEN DAnCE-1.0.3 and DAnCE-1.0.4 ======================================================= @@ -24,7 +29,7 @@ USER VISIBLE CHANGES BETWEEN DAnCE-1.0.1 and DAnCE-1.0.2 . A new logging macro, DANCE_LOG_TRACE has been added to the most fine-grained tracing messages. This can be disabled to improve - performance and footprint seperate from more useful logging messages. + performance and footprint separate from more useful logging messages. . Added capability to plugin custom log backends into the DAnCE logging service. These backends must be loaded via a svc.conf file diff --git a/DAnCE/PROBLEM-REPORT-FORM b/DAnCE/PROBLEM-REPORT-FORM index a2d84471149..1b946638f5b 100644 --- a/DAnCE/PROBLEM-REPORT-FORM +++ b/DAnCE/PROBLEM-REPORT-FORM @@ -41,9 +41,9 @@ To: ciao-users@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - DAnCE VERSION: 1.0.4 - TAO VERSION : 2.0.4 - ACE VERSION : 6.0.4 + DAnCE VERSION: 1.0.5 + TAO VERSION : 2.0.5 + ACE VERSION : 6.0.5 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/DAnCE/VERSION b/DAnCE/VERSION index 6c6a21a71a9..dee179ba8ba 100644 --- a/DAnCE/VERSION +++ b/DAnCE/VERSION @@ -1,4 +1,4 @@ -This is DAnCE version 1.0.4, released Tue Aug 23 19:01:44 CEST 2011 +This is DAnCE version 1.0.5, released Mon Oct 10 08:48:51 CEST 2011 If you have any problems with or questions about DAnCE, please send e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu), diff --git a/DAnCE/bin/ciao.localityconfig b/DAnCE/bin/ciao.localityconfig index e88358bec12..c16d271096f 100644 --- a/DAnCE/bin/ciao.localityconfig +++ b/DAnCE/bin/ciao.localityconfig @@ -3,5 +3,5 @@ edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Home_Ha edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Component_Handler edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Homed_Component_Handler edu.vanderbilt.dre.DAnCE.DeploymentInterceptor CIAO_Deployment_Interceptors create_CIAO_StoreReferences +edu.vanderbilt.dre.DAnCE.DeploymentInterceptor CIAO_Deployment_Interceptors create_CIAO_ReferenceLookup edu.vanderbilt.dre.DAnCE.DeploymentInterceptor DAnCE_Error_Interceptors create_DAnCE_Standard_Error - diff --git a/DAnCE/dance/DAnCE_Core.mpc b/DAnCE/dance/DAnCE_Core.mpc index dc030998f75..5801d78dc61 100644 --- a/DAnCE/dance/DAnCE_Core.mpc +++ b/DAnCE/dance/DAnCE_Core.mpc @@ -60,6 +60,12 @@ project (DAnCE_stub) : dancelib_with_idl, dance_output, \ Template_Files { DAnCE_Utility.tpp } + + InstallData_Files { + gendir = bin + ../bin/ciao.localityconfig + ../bin/nodemanager.localityconfig + } } project (DAnCE_skel) : dancelib_with_idl, dance_output, dance_stub, \ diff --git a/DAnCE/dance/DAnCE_Properties.idl b/DAnCE/dance/DAnCE_Properties.idl index f17c38f5dce..392f295de96 100644 --- a/DAnCE/dance/DAnCE_Properties.idl +++ b/DAnCE/dance/DAnCE_Properties.idl @@ -71,11 +71,11 @@ module DAnCE /// Property describing the implementation type of a monolithic implementation const string IMPL_TYPE = "edu.vanderbilt.dre.DAnCE.ImplementationType"; - const string CCM_CONTAINER = "edu.dre.vanderbilt.dre.CCM.Container"; - const string CCM_HOME = "edu.dre.vanderbilt.dre.CCM.Home"; - const string CCM_COMPONENT = "edu.dre.vanderbilt.dre.CCM.Component"; - const string CCM_HOMEDCOMPONENT = "edu.dre.vanderbilt.dre.CCM.HomedComponent"; - const string CCM_CONNECTOR = "edu.dre.vanderbilt.dre.CCM.Connector"; + const string CCM_CONTAINER = "edu.vanderbilt.dre.CCM.Container"; + const string CCM_HOME = "edu.vanderbilt.dre.CCM.Home"; + const string CCM_COMPONENT = "edu.vanderbilt.dre.CCM.Component"; + const string CCM_HOMEDCOMPONENT = "edu.vanderbilt.dre.CCM.HomedComponent"; + const string CCM_CONNECTOR = "edu.vanderbilt.dre.CCM.Connector"; const string DANCE_LOCALITYMANAGER = "edu.vanderbilt.dre.DAnCE.LocalityManager"; const string DANCE_INSTALLATIONHANDLER = "edu.vanderbilt.dre.DAnCE.InstanceHandler"; diff --git a/DAnCE/dance/DAnCE_Utility.cpp b/DAnCE/dance/DAnCE_Utility.cpp index db01d21f273..607ea5bca0e 100644 --- a/DAnCE/dance/DAnCE_Utility.cpp +++ b/DAnCE/dance/DAnCE_Utility.cpp @@ -285,6 +285,46 @@ namespace DAnCE return false; } + bool + get_resource_value (const char *type, + const ::Deployment::Resources &resources, + ::Deployment::Resource &val) + { + DANCE_TRACE ("DAnCE::Utility::get_resource_value<const char *>"); + + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_TRACE, DLINFO + ACE_TEXT("DAnCE::Utility::get_resource_value - ") + ACE_TEXT("Finding resource for type '%C'\n"), + type)); + + for (CORBA::ULong i = 0; i < resources.length (); ++i) + { + // search for the resource with resourceType + for (CORBA::ULong k = 0;k < resources[i].resourceType.length ();k++) + { + if (ACE_OS::strcmp (type, + resources[i].resourceType[k]) == 0) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_TRACE, DLINFO + ACE_TEXT("DAnCE::Utility::get_resource_value - ") + ACE_TEXT("Found resource for type '%C'\n"), + type)); + + val = resources[i]; + return true; + } + } + } + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_WARNING, DLINFO + ACE_TEXT("DAnCE::Utility::get_resource_value - ") + ACE_TEXT("Failed to extract resource for %C\n"), + type)); + return false; + } + template<> bool get_property_value (const char *name, const ::Deployment::Properties &properties, diff --git a/DAnCE/dance/DAnCE_Utility.h b/DAnCE/dance/DAnCE_Utility.h index e4d34ee2e18..7b0963f8f3f 100644 --- a/DAnCE/dance/DAnCE_Utility.h +++ b/DAnCE/dance/DAnCE_Utility.h @@ -4,7 +4,7 @@ * @file DAnCE_Utility.h * @author William R. Otte <wotte@dre.vanderbilt.edu> * - * Utility methods used throughought DAnCE. + * Utility methods used throughout DAnCE. */ @@ -20,6 +20,7 @@ #include "ace/Refcounted_Auto_Ptr.h" #include "tao/AnyTypeCode/Any.h" #include "dance/Deployment/Deployment_DeploymentPlanC.h" +#include "dance/Deployment/Deployment_TargetDataC.h" #include "dance/Logger/Log_Macros.h" namespace DAnCE @@ -59,6 +60,10 @@ namespace DAnCE const ::Deployment::SatisfierProperties &properties, T &val); + DANCE_STUB_Export bool get_resource_value (const char *type, + const ::Deployment::Resources &resources, + ::Deployment::Resource &val); + template<class T> void update_property_value (const char *name, diff --git a/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc b/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc index 07e4da3febd..d1f920ef46e 100644 --- a/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc +++ b/DAnCE/dance/LocalityManager/Configuration/Configuration.mpc @@ -1,5 +1,5 @@ // $Id$ -project (DAnCE_LM_Config_Plugins) : dance_deployment_stub, dance_stub, dance_lib, dance_output { +project (DAnCE_LM_Config_Plugins) : install, dance_deployment_stub, dance_stub, dance_lib, dance_output { dynamicflags += PROCESS_NAME_BUILD_DLL CPU_AFFINITY_BUILD_DLL PROCESS_PRIORITY_BUILD_DLL Source_Files { @@ -13,4 +13,8 @@ project (DAnCE_LM_Config_Plugins) : dance_deployment_stub, dance_stub, dance_lib Process_Priority.h CPU_Affinity.h } + + specific { + install_dir = dance/LocalityManager/Configuration + } } diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp index 4395b7c4350..0ef843479c3 100644 --- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp +++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp @@ -17,6 +17,7 @@ #include "dance/LocalityManager/Scheduler/Events/Remove.h" #include "dance/LocalityManager/Scheduler/Events/Passivate.h" #include "dance/LocalityManager/Scheduler/Events/Disconnect.h" +#include "ace/Auto_Ptr.h" namespace DAnCE { @@ -45,21 +46,17 @@ namespace DAnCE } void - LocalityManager_i::init (Deployment::Properties *props) + LocalityManager_i::init (const Deployment::Properties &props) { DANCE_TRACE ("LocalityManager_i::init"); - if (props) - { - DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, - (LM_DEBUG, DLINFO - ACE_TEXT ("LocalityManager_i::init - ") - ACE_TEXT ("Received %u properties from init\n"), - props->length ())); - this->props_ = props; + DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, + (LM_DEBUG, DLINFO + ACE_TEXT ("LocalityManager_i::init - ") + ACE_TEXT ("Received %u properties from init\n"), + props.length ())); - PLUGIN_MANAGER::instance ()->set_configuration (this->props_.in ()); - } + PLUGIN_MANAGER::instance ()->set_configuration (props); PLUGIN_MANAGER::instance ()->set_orb (this->orb_.in ()); @@ -83,10 +80,10 @@ namespace DAnCE config.load_from_text_file (ACE_TEXT_CHAR_TO_TCHAR (i->c_str ())); } - if (CORBA::is_nil (this->props_)) + if (props.length () != 0) { if (DAnCE::Utility::get_property_value (DAnCE::LOCALITY_TIMEOUT, - *this->props_, + props, this->spawn_delay_)) { DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, @@ -96,16 +93,22 @@ namespace DAnCE this->spawn_delay_)); } - for (CORBA::ULong i = 0; i < this->props_->length (); ++i) + DANCE_DEBUG (DANCE_LOG_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("LocalityManager_i::init - ") + ACE_TEXT ("Number of LM configuration properties: %u\n"), + props.length ())); + + for (CORBA::ULong i = 0; i < props.length (); ++i) { DANCE_DEBUG (DANCE_LOG_TRACE, (LM_DEBUG, DLINFO ACE_TEXT ("LocalityManager_i::init - ") ACE_TEXT ("Looking up configuration handler for <%C>\n"), - this->props_[i].name.in ())); + props[i].name.in ())); ::DAnCE::LocalityConfiguration_var config = - PLUGIN_MANAGER::instance ()->get_configuration_handler (this->props_[i].name.in ()); + PLUGIN_MANAGER::instance ()->get_configuration_handler (props[i].name.in ()); if (config.in ()) { @@ -113,11 +116,17 @@ namespace DAnCE (LM_DEBUG, DLINFO ACE_TEXT ("LocalityManager_i::init - ") ACE_TEXT ("Invoking configuration handler for <%C>\n"), - this->props_[i].name.in ())); - config->configure (this->props_[i]); + props[i].name.in ())); + config->configure (props[i]); } } } + else + { + DANCE_ERROR (DANCE_LOG_MAJOR_DEBUG_INFO, + (LM_WARNING, DLINFO + ACE_TEXT ("Warning: No configuration properties\n"))); + } } ::Deployment::Properties * @@ -302,41 +311,62 @@ namespace DAnCE CORBA::ULong dispatched (0); Deployment_Completion completion (this->scheduler_); + ::Deployment::Connections *conn_cmp = 0; + ACE_NEW_THROW_EX (conn_cmp, + ::Deployment::Connections (this->plan_.connection.length ()), + CORBA::NO_MEMORY ()); + ACE_Auto_Ptr< ::Deployment::Connections > conn_safe (conn_cmp); + CORBA::ULong conn_pos (0); + for (CORBA::ULong i = 0; i < this->plan_.connection.length (); ++i) { const ::Deployment::PlanConnectionDescription &conn = this->plan_.connection[i]; - for (CORBA::ULong j = 0; - j != conn.internalEndpoint.length (); - ++j) + + if (conn.externalReference.length () > 0) { - if (conn.internalEndpoint[j].provider) - { - CORBA::ULong instRef = - conn.internalEndpoint[j].instanceRef; - CORBA::ULong implRef = - this->plan_.instance[instRef].implementationRef; - - const char *inst_type = - Utility::get_instance_type (this->plan_.implementation[implRef].execParameter); - - Endpoint_Reference *event (0); - Event_Future result; - completion.accept (result); - - ACE_NEW_THROW_EX (event, - Endpoint_Reference (this->plan_, - i, - inst_type, - result), - CORBA::NO_MEMORY ()); - - this->scheduler_.schedule_event (event); - ++dispatched; - } + // connections with external reference endpoints + // we do not know how to resolve here; we just + // collect them and allow connect handlers/interceptors + // to handle them later + conn_cmp->length (conn_pos + 1); + (*conn_cmp)[conn_pos].name = conn.name.in (); + (*conn_cmp)[conn_pos].endpoint.length (1); + (*conn_cmp)[conn_pos].endpoint[0] = CORBA::Object::_nil (); + ++conn_pos; } + else + for (CORBA::ULong j = 0; + j != conn.internalEndpoint.length (); + ++j) + { + if (conn.internalEndpoint[j].provider) + { + CORBA::ULong instRef = + conn.internalEndpoint[j].instanceRef; + CORBA::ULong implRef = + this->plan_.instance[instRef].implementationRef; + + const char *inst_type = + Utility::get_instance_type (this->plan_.implementation[implRef].execParameter); + + Endpoint_Reference *event (0); + Event_Future result; + completion.accept (result); + + ACE_NEW_THROW_EX (event, + Endpoint_Reference (this->plan_, + i, + inst_type, + result), + CORBA::NO_MEMORY ()); + + this->scheduler_.schedule_event (event); + ++dispatched; + } + } } ACE_Time_Value tv (ACE_OS::gettimeofday () + ACE_Time_Value (this->spawn_delay_)); @@ -364,12 +394,6 @@ namespace DAnCE completed_events.size ())); } - ::Deployment::Connections *conn_cmp = 0; - ACE_NEW_THROW_EX (conn_cmp, - ::Deployment::Connections (this->plan_.connection.length ()), - CORBA::NO_MEMORY ()); - - CORBA::ULong pos (0); for (Event_List::iterator i = completed_events.begin (); i != completed_events.end (); ++i) @@ -411,14 +435,14 @@ namespace DAnCE event.id_.c_str ())); } - conn_cmp->length (pos + 1); - (*conn_cmp)[pos].name = event.id_.c_str (); - (*conn_cmp)[pos].endpoint.length (1); - (*conn_cmp)[pos].endpoint[0] = obj_ref; - ++pos; + conn_cmp->length (conn_pos + 1); + (*conn_cmp)[conn_pos].name = event.id_.c_str (); + (*conn_cmp)[conn_pos].endpoint.length (1); + (*conn_cmp)[conn_pos].endpoint[0] = obj_ref; + ++conn_pos; } - providedReference = conn_cmp; + providedReference = conn_safe.release (); } void @@ -1115,7 +1139,6 @@ namespace DAnCE // Explicitly close the plugin manager to release memory. PLUGIN_MANAGER::close (); - this->props_ = 0; this->poa_ = PortableServer::POA::_nil (); this->orb_ = CORBA::ORB::_nil (); } diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h index 51771277e91..746fe6ab12f 100644 --- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h +++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.h @@ -44,7 +44,7 @@ namespace DAnCE CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void init (Deployment::Properties *prop); + void init (const Deployment::Properties &prop); // Destructor virtual ~LocalityManager_i (void); @@ -83,6 +83,9 @@ namespace DAnCE void disconnect_connections (void); + const char * determine_instance_type (const ::Deployment::PlanConnectionDescription &conn, + const ::Deployment::Connection & providedReference); + ACE_TString uuid_; std::list< std::string > plugin_config_files_; @@ -105,8 +108,6 @@ namespace DAnCE ::Deployment::DeploymentPlan plan_; - ::Deployment::Properties_var props_; - DAnCE::Deployment_Scheduler scheduler_; CORBA::ULong spawn_delay_; diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp index 689e2cee62e..2a4fad9f612 100644 --- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp +++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.cpp @@ -63,7 +63,7 @@ namespace DAnCE PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in ()); - { + { PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -123,7 +123,6 @@ namespace DAnCE throw Error ("Failed to narrow callback IOR"); } - Deployment::Properties_var config; { Deployment::Properties *cf = 0; ACE_NEW_NORETURN (cf, Deployment::Properties (0)); @@ -137,7 +136,7 @@ namespace DAnCE } else { - config = cf; + this->config_ = cf; } } @@ -151,16 +150,16 @@ namespace DAnCE { // Callback to NodeApplication to get configuration sa->locality_manager_callback (lm.in (), - ACE_TEXT_ALWAYS_CHAR (this->uuid_.c_str ()), - config.out ()); + ACE_TEXT_ALWAYS_CHAR (this->uuid_.c_str ()), + this->config_.out ()); DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_TRACE, DLINFO ACE_TEXT ("LocalityManager_Task::svc - ") ACE_TEXT ("Configuration received, got %u values\n"), - config->length ())); + this->config_->length ())); - lm_srv->init (config._retn ()); + lm_srv->init (this->config_.in ()); DANCE_DEBUG (DANCE_LOG_MINOR_EVENT, (LM_NOTICE, DLINFO @@ -179,15 +178,24 @@ namespace DAnCE ACE_TEXT ("wrong Activator\n"))); throw Error ("Bad callback IOR"); } + catch (const CORBA::Exception &ex) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT ("LocalityManager_Task::svc - ") + ACE_TEXT ("Caught CORBA Exception while ") + ACE_TEXT ("calling back: %C\n"), + ex._info ().c_str ())); + throw Error (ex._info ().c_str ()); + } catch (...) { DANCE_ERROR (DANCE_LOG_ERROR, - (LM_ERROR, DLINFO + (LM_ERROR, DLINFO ACE_TEXT ("LocalityManager_Task::svc - ") ACE_TEXT ("Caught exception while calling back\n"))); throw Error ("Caught exception while calling back"); } - } else { @@ -205,7 +213,7 @@ namespace DAnCE (LM_TRACE, DLINFO ACE_TEXT ("LocalityManager_Task::svc - ") ACE_TEXT ("ORB Event loop completed.\n"))); - } + } root_poa->destroy (1, 1); root_poa = ::PortableServer::POA::_nil (); diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h index 7b9d733910f..5be09905c78 100644 --- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h +++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Task.h @@ -12,6 +12,7 @@ #include "ace/String_Base.h" #include "ace/Task.h" #include "tao/ORB.h" +#include "dance/Deployment/Deployment_BaseC.h" #include <list> #include <string> @@ -39,6 +40,7 @@ namespace DAnCE void usage (void); CORBA::ORB_var orb_; + ::Deployment::Properties_var config_; ACE_TString uuid_; ACE_TString callback_ior_str_; diff --git a/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc b/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc index f882502c5ac..9573e5c3501 100644 --- a/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc +++ b/DAnCE/dance/LocalityManager/Interceptors/Error_Interceptors.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DAnCE_Error_Interceptors) : dance_skel, dance_lib, dance_output, dance_logger { +project (DAnCE_Error_Interceptors) : install, dance_skel, dance_lib, dance_output, dance_logger { dynamicflags += DANCE_ERROR_INTERCEPTORS_BUILD_DLL Source_Files { @@ -12,4 +12,8 @@ project (DAnCE_Error_Interceptors) : dance_skel, dance_lib, dance_output, dance_ Standard_Error.h Best_Effort.h } + + specific { + install_dir = dance/LocalityManager/Interceptors + } } diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp index 8e1627990ae..87f7265a5f2 100644 --- a/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp +++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Action_Base.cpp @@ -69,8 +69,8 @@ namespace DAnCE } catch (CORBA::UserException &ex) { - DANCE_ERROR (DANCE_LOG_ERROR, - (LM_ERROR, DLINFO + DANCE_ERROR (DANCE_LOG_EVENT_TRACE, + (LM_INFO, DLINFO ACE_TEXT ("Action_Base::call - ") ACE_TEXT ("Caught CORBA UserException while processing instance ") ACE_TEXT ("<%C>\n"), @@ -79,8 +79,8 @@ namespace DAnCE } catch (CORBA::SystemException &ex) { - DANCE_ERROR (DANCE_LOG_ERROR, - (LM_ERROR, DLINFO + DANCE_ERROR (DANCE_LOG_EVENT_TRACE, + (LM_INFO, DLINFO ACE_TEXT ("Action_Base::call - ") ACE_TEXT ("Caught CORBA SystemException while processing instance ") ACE_TEXT ("<%C>\n"), @@ -89,8 +89,8 @@ namespace DAnCE } catch (...) { - DANCE_ERROR (DANCE_LOG_ERROR, - (LM_ERROR, DLINFO + DANCE_ERROR (DANCE_LOG_EVENT_TRACE, + (LM_INFO, DLINFO ACE_TEXT ("Action_Base::call - ") ACE_TEXT ("Caught C++ exception while processing instance ") ACE_TEXT ("<%C>\n"), @@ -137,8 +137,8 @@ namespace DAnCE } catch (CORBA::UserException &ex) { - DANCE_ERROR (DANCE_LOG_ERROR, - (LM_ERROR, DLINFO + DANCE_ERROR (DANCE_LOG_MAJOR_EVENT, + (LM_INFO, DLINFO ACE_TEXT ("Action_Base::call - ") ACE_TEXT ("CORBA UserException propagated from interceptors for instance ") ACE_TEXT ("<%C>\n"), @@ -157,8 +157,8 @@ namespace DAnCE } catch (CORBA::SystemException &ex) { - DANCE_ERROR (DANCE_LOG_ERROR, - (LM_ERROR, DLINFO + DANCE_ERROR (DANCE_LOG_MAJOR_EVENT, + (LM_INFO, DLINFO ACE_TEXT ("Action_Base::call - ") ACE_TEXT ("CORBA SystemException propagated from interceptors for instance ") ACE_TEXT ("<%C>\n"), diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp index b5160dc616c..17adb9d9193 100644 --- a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp +++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp @@ -40,8 +40,8 @@ namespace DAnCE DANCE_TRACE ("Connect_Instance::invoke_pre_interceptor"); (*i)->pre_connect (this->plan_, - this->connectionRef_, - this->provided_ref_); + this->connectionRef_, + this->provided_ref_); } diff --git a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp index ddbd049963c..86af1b646d8 100644 --- a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp +++ b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp @@ -151,7 +151,7 @@ namespace DAnCE void Plugin_Manager::set_configuration (const Deployment::Properties &config) { - this->config_ = config; + this->config_ = &config; } char * @@ -165,7 +165,7 @@ namespace DAnCE try { - plugin->configure (this->config_); + plugin->configure (*this->config_); CORBA::String_var instance_type = plugin->instance_type (); @@ -233,7 +233,7 @@ namespace DAnCE entrypoint); try { - plugin->configure (this->config_); + plugin->configure (*this->config_); DANCE_DEBUG (DANCE_LOG_MINOR_EVENT, (LM_INFO, DLINFO diff --git a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.h b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.h index ef3e0849ac4..7db45a4bf35 100644 --- a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.h +++ b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.h @@ -75,7 +75,7 @@ namespace DAnCE get_configuration_handler (const char *id); private: - ::Deployment::Properties config_; + const ::Deployment::Properties *config_; typedef std::map < std::string, ::DAnCE::InstanceDeploymentHandler_var > HANDLER_MAP; diff --git a/DAnCE/dance/Logger/Log_Macros.h b/DAnCE/dance/Logger/Log_Macros.h index e770a78ab8b..db75b5db10c 100644 --- a/DAnCE/dance/Logger/Log_Macros.h +++ b/DAnCE/dance/Logger/Log_Macros.h @@ -92,6 +92,7 @@ extern DAnCE_Logger_Export unsigned int DAnCE_debug_level; #if defined (DANCE_NLOGGING) # define DANCE_ERROR(L, X) do {} while (0) # define DANCE_DEBUG(L, X) do {} while (0) +# define DANCE_TRACE_LOG(L, X) do {} while (0) #define DANCE_ERROR_RETURN(L, X, Y) return (Y) #define DANCE_ERROR_BREAK(L, X) { break; } #else diff --git a/DAnCE/dance/NodeManager/README b/DAnCE/dance/NodeManager/README index dda9201e240..46541ee794e 100644 --- a/DAnCE/dance/NodeManager/README +++ b/DAnCE/dance/NodeManager/README @@ -1,8 +1,10 @@ /** +$Id$ + @page NodeManager README File - CIAO's NodeManager implementation. NodeManager is the bootstraping +CIAO's NodeManager implementation. NodeManager is the bootstraping mechanism to create new NodeApplication on the localhost. We currently depend on starting the NodeApplicationManager process on some port of all the hosts that have NodeApplication install to diff --git a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc index 1d74f0d36a6..db8db838284 100644 --- a/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc +++ b/DAnCE/dance/Plan_Launcher/Daemon/PL_Daemon.mpc @@ -1,5 +1,5 @@ // $Id$ -project (DAnCE_PL_Daemon_idl) : dancelib_with_idl, dance_output, gen_ostream, \ +project (DAnCE_PL_Daemon_idl) : install, dancelib_with_idl, dance_output, gen_ostream, \ valuetype, dance_deployment_stub { custom_only = 1 idlflags += -Wb,stub_export_macro=DANCE_PL_STUB_Export \ @@ -9,9 +9,13 @@ project (DAnCE_PL_Daemon_idl) : dancelib_with_idl, dance_output, gen_ostream, \ IDL_Files { PL_Daemon.idl } + + specific { + install_dir = dance/Plan_Launcher/Daemon + } } -project (DAnCE_PL_Daemon_stub) : dance_deployment_stub, dance_output, dance_lib { +project (DAnCE_PL_Daemon_stub) : install, dance_deployment_stub, dance_output, dance_lib { after += DAnCE_PL_Daemon_idl dynamicflags += DANCE_PL_STUB_BUILD_DLL @@ -26,6 +30,10 @@ project (DAnCE_PL_Daemon_stub) : dance_deployment_stub, dance_output, dance_lib Header_Files { PL_DaemonC.h } + + specific { + install_dir = dance/Plan_Launcher/Daemon + } } project (DAnCE_PL_Daemon) : dance_exe, install, dance_plan_launcher, utils, dance_stub { @@ -46,4 +54,8 @@ project (DAnCE_PL_Daemon) : dance_exe, install, dance_plan_launcher, utils, danc Header_Files { PL_Daemon_Impl.h } + + specific { + install_dir = dance/Plan_Launcher/Daemon + } } diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp index 7e305cb8dc0..d4ab078fb63 100644 --- a/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp +++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher.cpp @@ -11,6 +11,8 @@ #include "dance/Logger/Log_Macros.h" #include "dance/Logger/Logger_Service.h" #include "tools/Convert_Plan/Convert_Plan_Impl.h" +#include "tools/Config_Handlers/XML_File_Intf.h" +#include "tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h" #include "EM_Launcher.h" #include "NM_Launcher.h" @@ -38,6 +40,7 @@ namespace lm_ior_ (0), xml_plan_ (0), cdr_plan_ (0), + domain_file_ (0), uuid_ (0), am_ior_ (0), app_ior_ (0), @@ -46,7 +49,8 @@ namespace mode_ (LAUNCH), force_ (false), quiet_ (false), - em_timeout_ (1) + em_timeout_ (1), + domain_timeout_ (0) {} const ACE_TCHAR *em_ior_; @@ -54,6 +58,7 @@ namespace const ACE_TCHAR *lm_ior_; const ACE_TCHAR *xml_plan_; const ACE_TCHAR *cdr_plan_; + const ACE_TCHAR *domain_file_; const ACE_TCHAR *uuid_; const ACE_TCHAR *am_ior_; const ACE_TCHAR *app_ior_; @@ -63,6 +68,7 @@ namespace bool force_; bool quiet_; int em_timeout_; + int domain_timeout_; }; } @@ -77,8 +83,12 @@ usage(const ACE_TCHAR*) ACE_TEXT ("NodeManager IOR for NM based deployment.\n") ACE_TEXT ("\t--lm-ior <LocalityManager IOR>\t") ACE_TEXT ("LocalityManager IOR for LM based deployment.\n") - ACE_TEXT ("\t--manager-timeout <seconds>\t") - ACE_TEXT ("Number of seconds to wait for a valid manager reference.\n") + ACE_TEXT ("\t--manager-timeout <seconds>\t\n") + ACE_TEXT ("Number of seconds to wait for a valid Execution Manager reference.\n") + ACE_TEXT ("\t--domain-timeout <seconds>\t") + ACE_TEXT ("Number of seconds to wait for a domain validation.\n") + ACE_TEXT ("\t--domain-file <cdd>\t") + ACE_TEXT ("The domain file that the plan launcher should use for domain validation\n") /* ACE_TEXT ("\nName Service Options\n") ACE_TEXT ("\t--domain-nc [NC]\t\t) @@ -152,6 +162,8 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options) get_opt.long_option(ACE_TEXT("output"), 'o', ACE_Get_Opt::ARG_OPTIONAL); get_opt.long_option(ACE_TEXT("help"), 'h', ACE_Get_Opt::NO_ARG); get_opt.long_option(ACE_TEXT("manager-timeout"), ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("domain-timeout"), ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("domain-file"), ACE_Get_Opt::ARG_REQUIRED); int c; ACE_CString s; @@ -293,16 +305,38 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options) break; } if (ACE_OS::strcmp (get_opt.long_option (), - ACE_TEXT ("manager-timeout")) == 0) + ACE_TEXT ("domain-file")) == 0) { DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args - ") - ACE_TEXT ("Got Manager Timeout value: %C"), + ACE_TEXT ("Got domain file: %C\n"), + get_opt.opt_arg ())); + options.domain_file_ = get_opt.opt_arg (); + break; + } + if ((ACE_OS::strcmp (get_opt.long_option (), + ACE_TEXT ("manager-timeout")) == 0)) + { + DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, + (LM_DEBUG, DLINFO + ACE_TEXT ("Plan_Launcher::parse_args - ") + ACE_TEXT ("Got Manager Timeout value: %C\n"), get_opt.opt_arg ())); options.em_timeout_ = ACE_OS::atoi (get_opt.opt_arg ()); break; } + if ((ACE_OS::strcmp (get_opt.long_option (), + ACE_TEXT ("domain-timeout")) == 0)) + { + DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, + (LM_DEBUG, DLINFO + ACE_TEXT ("Plan_Launcher::parse_args - ") + ACE_TEXT ("Got Manager Timeout value: %C\n"), + get_opt.opt_arg ())); + options.domain_timeout_ = ACE_OS::atoi (get_opt.opt_arg ()); + break; + } default: usage (argv[0]); @@ -658,9 +692,8 @@ teardown_plan (const Options &opts, template <typename Manager> typename Manager::_ptr_type -resolve_manager (int delay, const ACE_TCHAR * ior, CORBA::ORB_ptr orb) +resolve_manager (ACE_Time_Value timeout, const ACE_TCHAR * ior, CORBA::ORB_ptr orb) { - ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (delay)); ACE_Time_Value retry (0, 1000000 / 4); CORBA::Object_var obj; @@ -780,13 +813,94 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) auto_ptr<DAnCE::Plan_Launcher_Base> pl_base (0); + + Deployment::DeploymentPlan_var dp; + + DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT, + (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher - ") + ACE_TEXT ("Parsing deployment plan\n"))); + if (options.cdr_plan_) + { + dp = DAnCE::Convert_Plan::read_cdr_plan (options.cdr_plan_); + if (!dp.ptr ()) + { + if (!options.quiet_) + { + DANCE_ERROR (DANCE_LOG_EMERGENCY, (LM_ERROR, DLINFO + ACE_TEXT ("PlanLauncher - ") + ACE_TEXT ("Error: Unable to read ") + ACE_TEXT ("in CDR plan\n"))); + } + return 1; + } + } + else if (options.xml_plan_) + { + dp = DAnCE::Convert_Plan::read_xml_plan (options.xml_plan_); + + if (!dp.ptr ()) + { + if (!options.quiet_) + { + DANCE_ERROR (DANCE_LOG_EMERGENCY, (LM_ERROR, DLINFO + ACE_TEXT ("PlanLauncher - Error: ") + ACE_TEXT ("Unable to read in XML plan\n"))); + } + return 1; + } + } + + if (options.domain_file_) + { + ::DAnCE::Config_Handlers::XML_File_Intf file (options.domain_file_); + file.add_search_path (ACE_TEXT ("DANCE_ROOT"), ACE_TEXT ("/docs/schema/")); + ::Deployment::Domain *plan = file.release_domain (); + + if (!plan) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT("PlanLauncher - Error - ") + ACE_TEXT("Error: Processing file <%C>\n"), options.domain_file_)); + return false; + } + + DAnCE_Domain_Validator_i validator (orb); + validator.load_domain (*plan); + + ::DAnCE::Time_Value tv; + tv.seconds (options.domain_timeout_); + CORBA::StringSeq_var late_nodes; + + if (!validator.block_for_domain (tv, late_nodes.out ())) + { + DANCE_ERROR (DANCE_LOG_EMERGENCY, + (LM_ERROR, DLINFO + ACE_TEXT ("PlanLauncher - Error: ") + ACE_TEXT ("Not all nodes in domain ready\n"))); + + for (CORBA::ULong i = 0; i < late_nodes->length (); ++i) + { + DANCE_ERROR (DANCE_LOG_EMERGENCY, + (LM_ERROR, DLINFO + ACE_TEXT ("PlanLauncher - Error: ") + ACE_TEXT ("Node <%C> is not started\n"), + late_nodes[i].in ())); + } + return 1; + } + } + + ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (options.em_timeout_)); + if (options.em_ior_) { // Resolve ExecutionManager IOR for EM base deployment. DAnCE::EM_Launcher *em_pl (0); + Deployment::ExecutionManager_var tmp_em = - resolve_manager<Deployment::ExecutionManager> (options.em_timeout_, + resolve_manager<Deployment::ExecutionManager> (timeout, options.em_ior_, orb); @@ -863,41 +977,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) pl_base.reset (lm_pl); } - Deployment::DeploymentPlan_var dp; - - DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT, - (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher - ") - ACE_TEXT ("Parsing deployment plan\n"))); - if (options.cdr_plan_) - { - dp = DAnCE::Convert_Plan::read_cdr_plan (options.cdr_plan_); - if (!dp.ptr ()) - { - if (!options.quiet_) - { - DANCE_ERROR (DANCE_LOG_EMERGENCY, (LM_ERROR, DLINFO - ACE_TEXT ("PlanLauncher - ") - ACE_TEXT ("Error: Unable to read ") - ACE_TEXT ("in CDR plan\n"))); - } - return 1; - } - } - else if (options.xml_plan_) - { - dp = DAnCE::Convert_Plan::read_xml_plan (options.xml_plan_); - if (!dp.ptr ()) - { - if (!options.quiet_) - { - DANCE_ERROR (DANCE_LOG_EMERGENCY, (LM_ERROR, DLINFO - ACE_TEXT ("PlanLauncher - Error: ") - ACE_TEXT ("Unable to read in XML plan\n"))); - } - return 1; - } - } switch (options.mode_) { diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc b/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc index 747d3e5bf5f..9763dc7403d 100644 --- a/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc +++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher.mpc @@ -22,7 +22,7 @@ project(DAnCE_Plan_Launcher_Impl) : install_lib, dance_lib, dance_logger, dance_ } } -project(Plan_Launcher_Exec) : install, dance_exe, dance_plan_launcher { +project(Plan_Launcher_Exec) : dance_domain_validator, install, dance_exe, dance_plan_launcher { exename = dance_plan_launcher Source_Files { Plan_Launcher.cpp diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base.h b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base.h index dd5204b33cd..ccad13bd487 100644 --- a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base.h +++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base.h @@ -52,9 +52,6 @@ namespace DAnCE /// Instructs the Manager to destroy the ApplicationManager. virtual void destroy_app_manager (CORBA::Object_ptr app_mgr) = 0; - /// Helper method to resolve externalReference endpoints into valid object references. - virtual void create_external_connections(const ::Deployment::DeploymentPlan &plan, - Deployment::Connections &conn) = 0; }; } diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp index 1cef97a7853..8e24e856421 100644 --- a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp +++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp @@ -453,8 +453,6 @@ Plan_Launcher_Base_Impl< Manager, AppManager, Application> { DANCE_TRACE ("Plan_Launcher_Base_Impl::launch_plan"); - //this->create_external_connections (plan, conns.inout()); - try { CORBA::Object_var app_mgr = this->prepare_plan (plan); @@ -465,9 +463,6 @@ Plan_Launcher_Base_Impl< Manager, AppManager, Application> 0, conns.out ()); - this->create_external_connections (plan, - conns.inout ()); - this->finish_launch (app.in (), conns, false); @@ -640,76 +635,5 @@ Plan_Launcher_Base_Impl< Manager, AppManager, Application>::destroy_app_manager( } } - -template <typename Manager, typename AppManager, typename Application> -void -Plan_Launcher_Base_Impl< Manager, AppManager, Application> -::create_external_connections(const ::Deployment::DeploymentPlan &plan, - Deployment::Connections &conn) -{ - DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, - (LM_DEBUG, DLINFO - ACE_TEXT("create_external_connections - start\n"))); - - for (CORBA::ULong i = 0; i < plan.connection.length(); i++) - { - if (plan.connection[i].externalReference.length() > 0) - //&& plan.connection[i].externalReference[0].provider) - { - DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, - (LM_DEBUG, DLINFO - ACE_TEXT ("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT ("create connection %C from IOR %C\n"), - plan.connection[i].name.in(), - plan.connection[i].externalReference[0].location.in())); - - try - { - CORBA::Object_ptr - obj = this->orb_->string_to_object(plan.connection[i].externalReference[0].location.in()); - - if (!CORBA::is_nil (obj)) - { - CORBA::ULong indx = 0; - for (; indx < conn.length (); ++indx) - - if (ACE_OS::strcmp (conn[indx].name.in (), - plan.connection[i].name.in ()) == 0) - break; - - if (indx == conn.length()) - conn.length(indx + 1); - conn[indx].name= CORBA::string_dup (plan.connection[i].name.in()); - conn[indx].endpoint.length(1L); - conn[indx].endpoint[0] = obj; - } - else - { - DANCE_ERROR (DANCE_LOG_WARNING, - (LM_DEBUG, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT("can't create object for IOR %C\n"), - plan.connection[i].externalReference[0].location.in())); - } - } - catch (CORBA::Exception &ex) - { - DANCE_ERROR (DANCE_LOG_NONFATAL_ERROR, - (LM_ERROR, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT("Caught CORBA Exception while resolving endpoint for connection %C: %C\n"), - plan.connection[i].name.in (), - ex._info ().c_str ())); - } - catch (...) - { - DANCE_ERROR (DANCE_LOG_NONFATAL_ERROR, - (LM_ERROR, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT("Caught C++ Exception while resolving endpoint for connection\n"))); - } - } - } -} } #endif diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h index 9e69b5b6299..a5b412e8550 100644 --- a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h +++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h @@ -69,9 +69,6 @@ namespace DAnCE virtual void destroy_app_manager (CORBA::Object_ptr); - virtual void create_external_connections(const ::Deployment::DeploymentPlan &plan, - Deployment::Connections &conn); - protected: /// Cached ORB pointer CORBA::ORB_var orb_; diff --git a/DAnCE/dance/RepositoryManager/README b/DAnCE/dance/RepositoryManager/README index 322b00098ac..24c635a30a2 100644 --- a/DAnCE/dance/RepositoryManager/README +++ b/DAnCE/dance/RepositoryManager/README @@ -1,9 +1,11 @@ +$Id$ + This is the README file for the Repository Manager (RM). Building RM: In order to be able to compile the RM you need to have ZLIB lib because the RM -uses it to read the contents of CCM packages. In order to compile the RM -successfully you will need to do the following: +uses it to read the contents of CCM packages. In order to compile the RM +successfully you will need to do the following: 1.Download the binary version of ZLIB or build it yourself 3.Create an "include" and a "lib" subdirectory. Then copy the libraries files into the "lib" subdirectory and copy zlib.h into the "include" subdirectory. @@ -17,7 +19,7 @@ If you want to get the component package through http server: 2.Start JAWS: $ACE_ROOT/apps/JAWS/server/main Start RM: -1.Using ior file: +1.Using ior file: RepositoryManagerDaemon -o 2.Using Naming Service: RepositoryManagerDaemon -v [NameofRM] @@ -28,7 +30,7 @@ Using RMadmin: > RMadmin -o -n BasicSP -i -l packages/BasicSP.cpk or > RMadmin -o -n BasicSP -i -l http://127.0.0.1:5432/packages/BasicSP.cpk (If the JAWS is started) - This will create the BasicSP directory, BasicSP.cpk file and BasicSP.epc file in the + This will create the BasicSP directory, BasicSP.cpk file and BasicSP.epc file in the $CIAO_ROOT/DAnCE/RepositoryManager/RepositoryManager/ 2.Delete component package: (use BasicSP for example) > RMadmin -o -n BasicSP -d @@ -36,7 +38,7 @@ Using RMadmin: > RMadmin -o -n BasicSP -f 4.Stop RM: > RMadmin -o -s - This will create the RM_record file in the $CIAO_ROOT/DAnCE/RepositoryManager/RepositoryManager/ which record the + This will create the RM_record file in the $CIAO_ROOT/DAnCE/RepositoryManager/RepositoryManager/ which record the names and UUIDs of the installed component packages. diff --git a/DAnCE/dance/Version.h b/DAnCE/dance/Version.h index ef4c0bec29a..0a10333bf8d 100644 --- a/DAnCE/dance/Version.h +++ b/DAnCE/dance/Version.h @@ -5,5 +5,5 @@ #define DAnCE_MAJOR_VERSION 1 #define DAnCE_MINOR_VERSION 0 -#define DAnCE_BETA_VERSION 4 -#define DAnCE_VERSION "1.0.4" +#define DAnCE_BETA_VERSION 5 +#define DAnCE_VERSION "1.0.5" diff --git a/DAnCE/docs/DAnCE_Logging.txt b/DAnCE/docs/DAnCE_Logging.txt index 3630295f7f8..064efc29f4f 100644 --- a/DAnCE/docs/DAnCE_Logging.txt +++ b/DAnCE/docs/DAnCE_Logging.txt @@ -1,3 +1,5 @@ +$Id$ + This file describes the various enviornment variables and command line options used to configure the logging service in DAnCE. In the case where both an enviornment variable and a command line option are diff --git a/DAnCE/docs/LocalityManager-Plugins.txt b/DAnCE/docs/LocalityManager-Plugins.txt index e7aee4ef323..600471c9f76 100644 --- a/DAnCE/docs/LocalityManager-Plugins.txt +++ b/DAnCE/docs/LocalityManager-Plugins.txt @@ -1,3 +1,5 @@ +$Id$ + The LocalityManager is a deployment entity that can be easily extended through the use of user-provided functionality plug-ins. These plug-ins fall into three categories: diff --git a/DAnCE/docs/sources/Error_Documentation.oo3/contents.bin b/DAnCE/docs/sources/Error_Documentation.oo3/contents.bin Binary files differnew file mode 100644 index 00000000000..841f8ce50de --- /dev/null +++ b/DAnCE/docs/sources/Error_Documentation.oo3/contents.bin diff --git a/DAnCE/docs/sources/Error_Documentation.oo3/contents.xml b/DAnCE/docs/sources/Error_Documentation.oo3/contents.xml Binary files differdeleted file mode 100644 index 843b76a81fc..00000000000 --- a/DAnCE/docs/sources/Error_Documentation.oo3/contents.xml +++ /dev/null diff --git a/DAnCE/docs/sources/LocalityManager.graffle b/DAnCE/docs/sources/LocalityManager.graffle index 010609bdcfd..9f2cebd504d 100644 --- a/DAnCE/docs/sources/LocalityManager.graffle +++ b/DAnCE/docs/sources/LocalityManager.graffle @@ -5,10 +5,10 @@ <key>ApplicationVersion</key> <array> <string>com.omnigroup.OmniGrafflePro</string> - <string>138.9.0.117994</string> + <string>138.30.0.155892</string> </array> <key>CreationDate</key> - <string>2010-03-17 08:44:59 -0400</string> + <string>2010-03-17 12:44:59 +0000</string> <key>Creator</key> <string>William Otte</string> <key>GraphDocumentVersion</key> @@ -26,7 +26,7 @@ <key>MasterSheets</key> <array/> <key>ModificationDate</key> - <string>2010-07-01 19:28:40 -0400</string> + <string>2010-07-01 23:28:40 +0000</string> <key>Modifier</key> <string>William Otte</string> <key>NotesVisible</key> @@ -42,6 +42,11 @@ <string>float</string> <string>41</string> </array> + <key>NSHorizonalPagination</key> + <array> + <string>int</string> + <string>0</string> + </array> <key>NSLeftMargin</key> <array> <string>float</string> @@ -49,8 +54,13 @@ </array> <key>NSPaperSize</key> <array> - <string>size</string> - <string>{612, 792}</string> + <string>coded</string> + <string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAx7X05TU2l6ZT1mZn2WgWQCgRgDhg==</string> + </array> + <key>NSPrintReverseOrientation</key> + <array> + <string>int</string> + <string>0</string> </array> <key>NSRightMargin</key> <array> @@ -63,4419 +73,6 @@ <string>18</string> </array> </dict> - <key>QuickLookPreview</key> - <data> - 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 - WL2EPpACoEDPAkA0hR8+VAxENJJAc49Lb+ntElDTqgBiwkIfSAcQffdsQyHhccROa9Dm - 6oF9eRSIudGbuFSaea5RLfmzQE7yLtDP9MlZ3wUolT7UFtXTZFk+1Ax/G8hJr4aQ6xZ8 - X+lT06rVM2GhD6RXD99D6MMz6C30QeHNuLwFbenjG8VTh++r1V39pdlOAMN52D4m+Bnu - mY2oG0qlRuVZ3aeMX9utbcWv+GB+/Q/HPPxmdsyTX28+q8EU+gBh9cWtk1+P7m7y14Vu - 1NeFGWHdqK8LlIowaguE0STCfKgaiKgsQmxZoPkN6bZo8deF4mlVhBUkLPyCdITBd+8x - L2O90OqpLfhFk2VmrC76wIxXxizMFXfnLwy5W78w5KIvDJTGL2iL6tEg5dWhQjZE1Ooz - NPe4tBZ83/jlaXn1gQmzekqvnvr3t6eOd1bhF0ptmhyO+bX5MQ5vfQiEp971e8Pu8PnT - V/H4UTz+qI9ZX+YHbb7tIbA9X2jguAqc80HXDRmv+KuHjN3Jm8u3F39/ii8v3p+CXxIf - l/t1fJ6jNwvD1B7gNRbYWgXF0+Gv/nzhdH9rZK7UrQuFvxC69HOk38K2C8V3d0ZfjFYH - 32hn1cWjSu1R8/IFY74o3vY521gxU6//BdkLWR4KZW5kc3RyZWFtCmVuZG9iago2IDAg - b2JqCjIxNDQKZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCA0IDAg - UiAvUmVzb3VyY2VzIDcgMCBSIC9Db250ZW50cyA1IDAgUiAvTWVkaWFCb3ggWzAgMCAx - MTUyIDczM10KPj4KZW5kb2JqCjcgMCBvYmoKPDwgL1Byb2NTZXQgWyAvUERGIC9UZXh0 - IC9JbWFnZUIgL0ltYWdlQyAvSW1hZ2VJIF0gL0NvbG9yU3BhY2UgPDwgL0NzMiAxMyAw - IFIKL0NzMSA4IDAgUiA+PiAvRm9udCA8PCAvRjEuMCAxNCAwIFIgPj4gL1hPYmplY3Qg - PDwgL0ltMSA5IDAgUiAvSW0yIDExIDAgUgo+PiA+PgplbmRvYmoKOSAwIG9iago8PCAv - TGVuZ3RoIDEwIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRo - IDU3OCAvSGVpZ2h0IDUxOCAvSW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAxNSAw - IFIgL0ludGVudCAvUGVyY2VwdHVhbCAvU01hc2sgMTYgMCBSIC9CaXRzUGVyQ29tcG9u - ZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dAxAQAAAMKg9U9t - Cy+IQGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMPAeGLVnAAEK - ZW5kc3RyZWFtCmVuZG9iagoxMCAwIG9iagozOTQwCmVuZG9iagoxMSAwIG9iago8PCAv - TGVuZ3RoIDEyIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRo - IDUzMiAvSGVpZ2h0IDkyIC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAg - UiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayAxOCAwIFIgL0JpdHNQZXJDb21wb25l - bnQKOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt0IEAAAAAw6D5U9/g - BIVQYcCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw8AYGPa4AAQplbmRzdHJlYW0KZW5k - b2JqCjEyIDAgb2JqCjY2NAplbmRvYmoKMTYgMCBvYmoKPDwgL0xlbmd0aCAxNyAwIFIg - L1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA1NzggL0hlaWdodCA1 - MTggL0NvbG9yU3BhY2UKL0RldmljZUdyYXkgL0ludGVycG9sYXRlIHRydWUgL0JpdHNQ - ZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHtm/s3 - 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 - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - CoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqC - mIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoR - g4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WC - xKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhiCoqCmIoRg4WCxKhi - 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 - 0ejji7UuJuBjNHp7bzcYPCgfZ7X/2FI/dAQy+9ol7P1xmhKihqxpH7J3dNqqd3F1dXN3 - d/fw8PT0NGBpfAIk2cODdLu5urrotzo52tvZ0AXMYss3B0S70OI2ZK72IdqI7BwcVUZ6 - Z2cXF2oJS+sTIM3OznoVj6ODHW0/av+hI7TagL56BfvolkxdyuiuzNLKWqezoYzs7R2o - JKz1MQEHB3t7isdGp7O2sqTzj6mfr9yELcezdCWjbYgaUhFZUEUqIwqJli2W5iegPCvf - 1lZUD+0+Wzar/edvbEBLLalr2SYztROpjKijpWWFpekJLHu2tFDxqN3nf8rno53IlJHa - jbDW1wQ209aj4vkfdp9PLmgbaZk+xvQfZljrYAIffCv7n+TwPf9HfRjW+pnA97SCfxYT - wAQwAUwAE8AEMAFMABPABDABTOD/8wT+H+xAizYKZW5kc3RyZWFtCmVuZG9iagoxNyAw - IG9iago4MTQ0CmVuZG9iagoxOCAwIG9iago8PCAvTGVuZ3RoIDE5IDAgUiAvVHlwZSAv - WE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDUzMiAvSGVpZ2h0IDkyIC9Db2xv - clNwYWNlCi9EZXZpY2VHcmF5IC9JbnRlcnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9u - ZW50IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7Z37U1PXFsd5GfJ+ - wElCXpBACkQwEAWjYYIBaZC3IqkPCgW5IKCAE0tTJ4pcpCJQQTOgoAgiWJS3UUBtnfuv - 3bVPEosBNASdZnf29xeIzJxsv+sza629zzl7h4UREQeIA8QB4gBxgDhAHCAOEAeIA8SB - EHEgnAhzB74aSMiHiI+KJMLSgY8BjEDx3AscXhoiI6OiovYRYe8AhDEyksYjSC5oIAAH - 5AQjOprpE4sIMwd8kWNGRzNQND1g7BoLDxAoOzCABhaLzQFxQTwiDB1AkUMRZLNYTCYC - AxIG5ItdYYE6CJQhGMAD4MDl8fkCgVAoIsLWAaFQIODzeYAGG7hAWNBUBNpaoCQBRECG - YHE4gAOwEBNLUWKxRCKREmHoAAROLKao2BiRSAhgcDgslC0QFQGmCg8R+6KZbA6XL0A4 - AAkyuVyuUCiVShURdg5A2BQKCKBMKpUgMAR8LofNjPbkikBmIR4kUI7g8YUxlFgaJ1eo - VAlqtUaTmESEqQOJGo1anaBSKeRxUjEVI4RkAbnCkyq+VD9Q3YCyAURwEREAhCperUnS - JienpOp0uv0epRFh4oA3YBC61JTkZG2SRh2vAiwQFVygAgrIl+uHFwk2hyZCpoxXAw+p - +9PT9RkZmQbQQSLsHEBxy8zI0Ken708FLtTxShlNBRQQDxSfzRQ+JLh8ESWRKRM02mQd - 4GA4lHXYaDxy1PS3cohC3oG/o2U6esRoPJx1yABg6JK1mgSlTEKJ+NwAoKCRiGZyeAIR - JVXEa7SpafrMQ9lGU44512LJyz+OVECElQN00PLzLJZcc47JmH0oU5+WqtXEK6SUSMDj - oKYCyseOmQKQiIReApCIEctU6qSUtAxD9pGcXMvx760niopLSkvLysrKiTBzAIJWWlpS - XHTC+v1xS27OkWxDRlpKklolE8cgKBj70Jx0JyjCvUgIYyVyVWKyTm84bDLnFRQWl1ac - rDxts/1w5iwRlg6c+cFmO115sqK0uLAgz2w6bNDrkhNVckms0AvFTkwAElEMJpsnACTi - k1LSM7NNufnW4vJTtjPnqmtr6+ouXGhA+g8RRg7QIbtwoa6utrb63BnbqfJia36uKTsz - PSUpHqAQ8KCngNWrHaBAs9BoFlcQg5BIPXDQaM63llRUna2urW9oam5pvXy5ra29vb2D - CCsHIGRtbZcvt7Y0NzXU11afraooseabjQcPpCIoYgRcFt1SbFs8UOWA/pIvEgMSOn3W - 0WMFRUBETX1j86X2K/arnZ2/OH4lwtIBxy+dnVftV9ovNTfW1wAVRQXHjmbpdQCFWMRH - feYOiSIc0gRCgpKpklL1WSaLtbQSiGhqbbd3Oq45b3Td7O7+LxGWDnR33+y64bzm6LS3 - tzYBFZWlVospS5+apJLBlJTDhLnHdsWDThMsrpCSKjUpBwCJwrKq83WNrR1XHc6u7p7e - 2319d/oHiLB0oP9OX9/t3p7uLqfjakdrY935qrJCgOJAikYppYSoemybKLxpApoJdXL6 - waOWwnJb9YXmNvuvzu5bt/sH7g4ND9+7f99FhKED9+/fGx4eujvQf/tWt/NXe1vzhWpb - eaHl6MH0ZDW0FDsmiogIaDB5QkoGzUSm8Zi1zPZjQ0tHp/Nmb9/g0D3XyOiDh2OgcSLs - HEBxe/hgdMR1b2iwr/ems7OjpeFHW5n1mDETWgoZJeRBooiI2NJlotIB3UQMqhz6LHNB - aVV1Q8sVx/WevsFh1+jY+OOJJ5OTk1NTU0+JMHMAggahezLxeHxs1DU82Ndz3XGlpaG6 - qrTAnKVH1YNOFNsUDygdDNRNyOK1aQZTXlHl+XpAoqu3f8g1Oj4x+XT62czs7HPQH0SY - OYCiNjs782z66eTE+KhrqL+3C6CoP19ZlGcypGlRouCyGNt0meFQOth8kUShSck4nGut - OFt3sQOQGBgeGZuYejb7x9yLl/O0Fogwc8ATt5cv5v6YfTY1MTYyPABQdFysO1thzT2c - kaJRSER8NhSPLTMPunQIqDiVdr/BlF9SVdPY1nkDkBh9NDn9fG5+YXFpaXllZWWVCEMH - IHDLS0uLC/Nzz6cnH40CFDc62xprqkryTYb9WlUcJYDpaOSWhoIuHbBcpU4+kG2GNFHf - anf29AMSUzNz84vLq6uv3K+JMHbA/Wp1dXlxfm5mCqDo73HaW+shUZizD8DUQyyii4df - kwntBCodUmWiLvOIpbiqpqnDcbNvaOTR1OzcwvKq+/WbtXWPNogwc8AbuLU3r92rywtz - s1OPRob6bjo6mmqqii1HMnWJSikqHlsaCtROcPixcfHa9EM5BeWQJq46ewddY5MzLxZX - 3G/W1zfeviPC2oG3G+vrb9wriy9mJsdcg73Oq5AoygtyDqVr4+Ni+ZytDQUwweQIKCgd - +mxz4anqxnZHd9/wg4npuYUV99o6APH+T9BfRFg6gGL3/t27t+tr7pWFuemJB8N93Y72 - xupTheZsPRQPuqHwbzLDYXWCKxIrNKkZRktRVW2z3Xlr0DU+NTu/7F7bACB8Vnwgws4B - X+wAi4019/L87NS4a/CW095cW1VkMWakahTQUECT6TfxiIhksHjQTiTpDKbjpWfqL3V2 - 3R4anXg2t7j6ev3de7iqnxP/Iwp5B/xCBkF8/2799eri3LOJ0aHbXZ2X6s+UHjcZdEnQ - UPBYDP+JBzDBhkVMlTYN2omKcw1tju4798YmZ18uudfe+iER8l6QAW5yYBMYCIq3a+6l - l7OTY/fudDvaGs5VQEORplXBUiZ7KxNo2gEt5nfpWWbryeqmjms9A67xp8/nVyBNQOHY - dOUPm76Q/BryDmyO3F9//QmJYmX++dNx10DPtY6m6pNWc1b6d6jJRBOPTyejMBXl8ClZ - AqxO5J6orLlod/b+PvJ4GkrHmw1gwnfhkHeADHBbB3zxAyY23kDxmH488nuv036xpvJE - LqxQJMgomHhsZcIz7UjJMB4rOl3bYr/+213UTiytrm1A6fBec9vvI/+IgQPeAELx2Fhb - XUINxd3frttbak8XHTNmpHgmHjsx4Zl2/NT68w1oMZ/MvFh6hdoJggQGYf/8EH1QQEPx - aunFzBNoMm/83PqTZ+KxAxOwPCGk5DAVhVVMWx1MO2B14glqMdc/MvH5LyV/DW0HPFBA - k7mOmswnsEIBE486G6xkwmRUTgnhjod/P4GYEMs1sLKdV+Jl4iFMO5bdqMWkrxfa/2Uy - ui85QAcRNZnuZZh4PPQyUZIHq9sauXhHJhReJuovozwBTMCKlY+JL30l+XuoO4Cg8DAx - 72Xicr3Nw4SCMBHq0fs24wuOCVI7vk00QuKqwdUO0mOGRPC+zSBoJD7sqseM8qxPkLno - t4nIP35VDxKIicDnol4myJrVPx69bzIAHxK7W7Mia9vfJBihcVEvEmjasZu1bXIPLDTC - 97VH4cMB/dzlPTByr/xrByNErreJid3eKyfP1IRIDL/iMDbh4MkSu3umhjx752fgv+kj - 5Adau3z2jjyj6zPuX/kzuGd0ybP8WD+oH8Dgg3iWn7zzg9mrPAEPN9h3fsLIu4EYv/cX - yNB3/25g2HbvEF8n7xBj+MLwNkPe+g7x9UDeISZ7DWC2g0Dgww16rwGyJwlmO40EPtw9 - 7ElC9i7CbE+iQIcb9N5FYWSPM+z2Lgt0wMHucRZG9kLEcJPDAId8P8i9EMmeqVjuhhrY - oIPcM9WXKMjeyljunvz5QQe5tzIwQfZgx3KD9QAGHewe7NBlkrMasDqFIbDB7uWsBpQo - yJkuGJ3WEthQ93amC1090HFg5OwnLA94+syggz77CZiAloKcEYfZEXBfHO6ezohDUEBL - Qc6SxOqsyC8Ndm9nSYZ5oIBz4siZsyF/oGwAA/wqZ87+DQU5mxq7E6h3HvDezqYOI2fY - Y3I4fYDD/Bpn2NOZIhI1FSwOD51jL5bGyRUqVYJardEkJhFh6kCiRqNWJ6hUCnmcVEzF - CPk8DgsdS/25I4g37YKHZh9R+4AKNofLF4hiYimJVCqTy+UKhVKpVBFh5wCETaGAAMqk - UgkVGyMS8LkcNhARMBKQKTxUMFCugGTBF4oQGJRYLJEAHUT4OQCBE4sphINIyIcUgXIE - w0OE337Km3KD368ABZ0rGEwmi83hcAEMgUAIbBDh6oBQKBAADlwOh81iwrn1NBH+u677 - YfDpR5QqgAooIZAtmCwEBqAB4hFh6ACKHIogmwU8QIbYF4UaiYjwgJOElw4PFqizQGAA - GV6xiDBzwBc5ZjTCAWWIoIDwcEFjAfkCEgaNBrogEb4OQBhpHILIEJ+UkXAQpBmvIomw - dMAXP0TDrivGJzx88gFdjAhnBz4JJ/lAHCAOEAeIA8QB4gBxgDhAHCAOEAf+SQf+D4mV - 0goKZW5kc3RyZWFtCmVuZG9iagoxOSAwIG9iagozMjgwCmVuZG9iagoyMCAwIG9iago8 - PCAvTGVuZ3RoIDIxIDAgUiAvTiAzIC9BbHRlcm5hdGUgL0RldmljZVJHQiAvRmlsdGVy - IC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHVWXVYFV2333Oa7kN3d3d3Kt0KHA7dLaVI - qqCCdCmlAiohUiJKCCKhgIRNCSqKCgrScgd93/f77vPd+9/9587zzJ7fWWvttfeZtWf2 - +q0BgHmFEBISgKAGIDAoIszKUIfLwdGJC/sKoAE7oIdPSQIxPETbwsIM/K/Hz2kAHSon - xA99/a9m/7OCxsMznAgAZAGr3T3CiYEwbgYAoUMMCYsAALkFy8dORITAGPUYxvRh8ARh - /OYQe//Bq4fY/TdGo37b2FjpAoBmAgBHTiCEeQNAwQfLuaKI3rAfCj0AMLRBHr5BANA5 - wFiD6EPwAIC5ELYRCwwMPsR9MBZy/zc/3v+GCQT3f3wSCN7/4D//Be4JD6znGx4SQIj5 - /eP/sgkMiITv1++DFm7JgwKOHsYGD58fPQh6pvCVDT5/hQT8jhlsA7F4Btlaw7JDLBbk - ftT8L6zhFWZgBWO4L2QREqFziOF7BnmFRFjY/CU/FeujexTG5LA81zNc/28/5X4Ek8OY - UcLyprBIK1sY88G4OzzKWh/G8IqCFmN9bOz/sln38NT7S45AePkaGP+xQdD6RhgfjkUP - x5zHP9j0cA7wWAgFYAoCgCeIBGFwGwTEgRnQBXp/teLACxBgTRSsCwf+4D2MA+EewXCf - YBhz/WWn+x8Sg9/9vOF+/90jFyDCtpH/jPlnNC54zL99+gIPGP8tJ8BjHOoOZxfu6pv0 - rzH/tjj093s2UjellqX2/p4TSgAlg5JH6aDUURooZcCFwqNYgDhKDqWE0kZpolRhnTIw - AIuwZ++/53joP7DJK6owOEbFzgfWHv5397+1wO63te8/v/9jBsD36Urbyt8zACDCMxp+ - DgDQDQ6JCfP19ong0oafXE8xLuMgooQYl4yUtNSh+v/NcfjO+jPZH1a/30UQfvRfMpd5 - AOTh9YZa/JcsOBmA2+cA4Cj5l0woFH7uJQBoqCdGhkX98Yc6vKABKaCCVygz4AC8QAi+ - zzJAAagCLaAPTIA5sAGOwAVePz7wGgwDJ0A8SARpIANkgTxQDMpAFagBdaAJtIFO0AMe - gWEwBqbAazAHlsBnsAp+gl0IgrAQBUQHMUOcED8kCslASpAGpA+ZQVaQI+QGeUNBUCQU - DyVDGVA2VAxVQLXQbegu1AMNQuPQS2geWoa+QzsIJIIcQY9gRwggJBFKCG2EKcIGcRzh - jQhFxCJSEBcRhYhKxC1EK6IHMYyYQswhPiM2kABJhsQjuZHiSCWkLtIc6YT0QoYhTyHT - kfnISmQ9sgM5gJxAziFXkNsoDIoOxYUSh9epEcoWRUSFok6hzqOKUTWoVlQfagI1j1pF - /UJToNnQomgVtDHaAe2NPoFOQ+ejr6Nb0P3oKfQS+icGg8FjBDGKGCOMI8YPE4c5j7mM - acB0Y8Yx7zAbWCyWGSuKVceaYwnYCGwatgh7C9uFfYZdwm7hyHCcOBmcAc4JF4RLwuXj - buAe4J7hPuB2SahJ+ElUSMxJPEhiSDJJrpJ0kIySLJHsktKQCpKqk9qQ+pEmkhaS1pP2 - k74h/UFGRsZDpkxmSeZLdpqskKyR7DHZPNk2OS25CLku+THySPKL5NXk3eQvyX9QUFAI - UGhROFFEUFykqKV4SDFDsUVJRylBaUzpQZlAWULZSvmM8isVCRU/lTaVC1UsVT7VHapR - qhVqEmoBal1qAvUp6hLqu9TPqTdo6GikacxpAmnO09ygGaT5SIulFaDVp/WgTaGton1I - +44OScdLp0tHpEumu0rXT7dEj6EXpDem96PPoK+jf0q/ykDLIMdgxxDNUMJwn2EOj8QL - 4I3xAfhMfBN+Gr/DyM6ozejJeI6xnvEZ4yYTK5MWkydTOlMD0xTTDjMXsz6zP/Ml5jbm - tywoFhEWS5YTLFdY+llWWOlZVVmJrOmsTayv2BBsImxWbHFsVWwjbBvsHOyG7CHsRewP - 2Vc48BxaHH4cuRwPOJY56Tg1OH05czm7OD9xMXBpcwVwFXL1ca1ys3EbcUdyV3A/5d7l - EeSx5UniaeB5y0vKq8TrxZvL28u7ysfJd4Qvnu8m3yt+En4lfh/+Av4B/k0BQQF7gTMC - bQIfBZkEjQVjBW8KvhGiENIUChWqFJoUxggrCfsLXxYeE0GIyIv4iJSIjIoiRBVEfUUv - i46LocWUxYLEKsWei5OLa4tHid8Un5fAS5hJJEm0SXyV5JN0krwkOSD5S0peKkDqqtRr - aVppE+kk6Q7p7zIiMkSZEplJWQpZA9kE2XbZNTlROU+5K3Iv5Onkj8ifke+V31dQVAhT - qFdYVuRTdFMsVXyuRK9koXRe6bEyWllHOUG5U3lbRUElQqVJ5ZuquKq/6g3Vj2qCap5q - V9XeqfOoE9Qr1Oc0uDTcNMo15jS5NQmalZoLWrxaHlrXtT5oC2v7ad/S/qojpROm06Kz - qauie1K3Ww+pZ6iXrvdUn1bfVr9Yf8aAx8Db4KbBqqG8YZxhtxHayNToktFzY3ZjonGt - 8aqJoslJkz5TclNr02LTBTMRszCzjiOIIyZHco68Ocp/NOhomzkwNzbPMX9rIWgRanHP - EmNpYVli+d5K2ireasCaztrV+ob1Txsdm0yb17ZCtpG2vXZUdsfsau027fXss+3nHCQd - TjoMO7I4+jq2O2Gd7JyuO2046zvnOS8dkz+Wdmz6uODx6OODLiwuAS73XalcCa533NBu - 9m433PYI5oRKwoa7sXup+ypRl1hA/Oyh5ZHrseyp7pnt+cFL3Svb66O3uneO97KPpk++ - z4qvrm+x75qfkV+Z36a/uX+1/0GAfUBDIC7QLfBuEG2Qf1BfMEdwdPB4iGhIWshcqEpo - XuhqmGnY9XAo/Hh4ewQ9nByORApFpkbOR2lElURtnbA7cSeaJjooeiRGJOZczIdYg9hr - cag4YlxvPHd8Yvz8Se2TFaegU+6nehN4E1ISlk4bnq5JJE30T3ySJJWUnbSebJ/ckcKe - cjrlXaph6s00yrSwtOdnVM+UnUWd9T379JzsuaJzv9I90ocypDLyM/bOE88PXZC+UHjh - 4KLXxaeZCplXsjBZQVnTlzQv1WTTZMdmv8s5ktOay5Wbnrue55o3mC+XX1ZAWhBZMFdo - VthexFeUVbRX7FM8VaJT0lDKVnqudPOyx+VnV7Su1Jexl2WU7ZT7lr+oMKxorRSozK/C - VEVVvb9qd3XgmtK12uss1zOu71cHVc/VWNX01SrW1t5gu5F5E3Ez8ubyrWO3xur06trr - xesrGvANGY2gMbLx022329NNpk29d5Tu1DfzN5e20LWkt0KtMa2rbT5tc+2O7eN3Te72 - dqh2tNyTuFfdyd1Zcp/hfuYD0gcpDw66Yrs2ukO6V3q8e971uva+fujwcLLPsu9pv2n/ - 40cGjx4OaA90PVZ/3DmoMnh3SGmobVhhuHVEfqTlifyTlqcKT1tHFUfbx5THOsbVxh88 - 03zWM6E38WjSeHJ46ujU+LTt9Ivnx57PvfB48fFlwMu1V1Gvdl+ffoN+k/6W+m3+DNtM - 5azwbMOcwtz9eb35kQXrhdfviO8+L4Yv7i2lvKd4n/+B80PtR5mPncsGy2OfnD8tfQ75 - vLuS9oXmS+lXoa/N37S+jaw6rC6tha0dfD//g/lH9brceu+GxcbMz8Cfu5vpW8xbNdtK - 2wM79jsfdk/sYfcK94X3O36Z/npzEHhwEEIII/zOBZBwi/DyAuB7NcwhHGHuMAYAafcf - TvHbAqYrEGxzaAdwcL7AD9SAEzgFasFriA0Kh6YQhohBpDuKGjWMLsNkYPNwzSQfySTJ - T1MsUjlRD9Mq0FUzUOEDGTuYtlkkWc3ZXNldOKw5jbjUuCV4uHgZ+Mj4sQJAYFvwu9BX - 4fciS6LzYi/EJyTGJIel+qW7ZNpkG+Vuyl9XKFcsUspVvqCSoOqppqnOrP5dY1CzSitR - 201HVZdNd09vRr/LoMIwzSjQ2MZE1ZTHDGf2HX5j9JvXWxRapliFWXvYONha2Zna6zmo - Oco5iTsLHuM6zuLC6MrgRkugdqcl0nswerJ68XiL+Cj4avmZ+TsGOAaaBCkE84bQhhyE - roS9DB+IaI4si7p4IibaI8YyVjVOIJ4yfuvk/KmhhObTpYkpSdHJeSldqR/O0J7VPBeY - fjlj+PzeRZlMz6yyS9M5FLkGeUn5XQW7RcrFMSUdpZtXZMrsywMqUiqvVN25OnJt8fpu - DX2t5A2zm763Uuoq63sa3t1GNgneMWkOaMlsvdM21f7l7sE92k7e+4oPTLqcu/174nvT - H+b2VfbffNQ40PK4bbBtqHW4eaTpSd3TqtH8sbTx8GcuE0aT0lP4qd3puec9LypfJr8i - vtZ7w/cW9fbjzNBs41zefPyC57sji1JLtEvf309+aPtYvpz96fznvJVbX15941hN/E7x - 49FG1+buTuX+0MHB7/iTAAYgCGeIbnAm2Aw+QcJw/PsRvIhcJDXyKsoEjUXPYMax07h9 - UiWyLAqIMpZqh+YMHTV9KsM2owNTEfMEyzoblp2UfYfjE+dbrhHuezx1vOV8hfzZAmcE - TwqFCXuLuIk6ih0R15fQlJSTEpTmlKGRRcpuyX2Rn1eYVBxQ6lC+rpKqaq8mqravPqpR - pRmrZaUtpIPUmdHt0CvQjzCwM1Q0YjHaN5416TWtNss8EnHUyVzbQsiSznLfasX6rc2Y - bY/dHfurDgWO6U6nnEOP+Rwnuji72rhZE6zdLYk2Ho6erl6+3uE+J33T/dL9YwI8As2D - 1IOFQvChiNCvYa/DH0U0RV6JOnviRLRrjGmsXBxHPDZ+7eSbU/0JDaerEpuTxpO/plKm - SZ2xPht97nJ6f8b3C5wXLTITs1ouLedw5zrn5edPFNIWWRdnloyV7l3hKNOH10BWZVvV - zDXkddFq25rE2vobL29h6xTr/RqKG8ebsHdUmkNaqltn22nuanb43yvo7Lu/2sXSrdMT - 2Jv7sL1v/hF6QOix6WDQUNZw08jUk51R9jH5cfVnGhMak2pTatOqzxVfyL2UeiXymucN - 61uaGfTMzuynubfzwwud724sFixdh+O+v8z3yeJz3ErVl9Gve6tSa77fq34sbcj8TN2c - 2dbbadzj3s8/IP8dfwhgYMbABiRghkAASXD+PwlhoKPQFWgD4YaYQrogt1C16ECMAVYZ - p0ViSxpPVkf+iZKPyo76LE097WO6UfpBhjZ8DqMrEx/TInM1iy+rEOtntgb2KA4NTiTn - AFcGtzkPnucVbymfKz8v/6LAVUF3IQ6hV8IFIjaiVKKPxRLFVcTXJAollSVfScVKs0h3 - yDjL7MtekdOWW5BPURBUGFQMUKJSuq1sq7ypUqSqrjqrlqTOr/5YI1CTXrNHK1xbVHtB - p1jXSo9Er0c/zkDBYM2wwSjYWNz4i8lt0xNmKnCeMXK0wNzDQtoSWI5alVgTbURsvtm2 - 2p2yN3Agd5h0LHVydxZzXj92//hZFytXTtdPbq2EVHcbIh9x3aPfM8+L4C3pvecz6Fvo - 5+2vEIAMeBZYFRQerB+CD1kKbQ07G+4UIRYJIiejak7ERlvFyMQyxiHj1uJnTo7Ce3bL - 6brE2qSa5Bspt1Kb0u6deXR2/Nx8+vfz4AL1Re5MuSyjS8eyQ3LScivzevIXCtFFksXO - JedKuy9vl8mWh1e0VG5f1b6Wcf1ljWBt5I2RW/x1J+unGiVvZzQtNWu3lLf+ane5232P - pzPl/nKXaXdzL/PDpL6Pj8wHOgeFh9KG3z1RepoxujSu+6xxUnSq+bnDS/bXqLdcs7EL - Akvqy8gv2xvlh/H/U1s63BMwCgCUNAHgsACAdSkAFwrgslICAIykAFhQAGCjDKD3XgB6 - 9xxA8r3/7B/SwBaubeSARpgrLoF9CA9JQAaQK3QCyoJqoF7oDbQFszxphAUiBJGNaEPM - ILFIOaQnsgQ5DfMzK1Qu6gWaHe2BvonewGhjMjEzWGlsEvYFThqXjlsi0SWpIkWT+pOO - wwyoipyGPIF8lcKT4h1lIOU21TlqdupGGj2aGdooOlq6BnoL+jWGHLwSfpbxHJMC0wJz - Nos+yw5rI5s3zA+mONI5dTj3uTq4Y3nUeA54+/ku8NsIsAt8EmwTSha2EuEVWRftFysU - 95PQksRLfpGakB6SGZAdkOuXH1YYV3yt9F55WxWnxqWuomGjGalVoN2js6zHpG9gEGfY - ZPTWeMZk2nTCbPTI0NEB836Lh5YP4ay1z6bfdtDusf2Iw7jjc6cZ58Vjn4+vu/xywxHo - 3DmIkh6ang5emd7jvpTwvpQdMBXEGuwV0hi6Ha4XcTHyzQnx6PiYJ3Fs8aEnexPoTvsn - 9iVzpESnTp3ROtuRLpnReEH0Ym2W6KU7Oeq5A/lOBetF6SWipVNXTpfLVnyuqr3mVy1Z - s3dj+lZ7fVVjYVNe86XWsvbbHY86P3aR9cg/JPZfGhgc3ByReHpsLOfZwOSP54ovE19P - zAjMRS20Ly59QH/c/7S8cuvr8W/ra0Hfh9bpNsx+em9Gb8Vve+8Y7jLuzuyV7uvtr8A5 - x+H+IQFXFBJABegGb8EWXBUQgysBLjD/vwBdgx5Az6FVBCmCH6EDv0sSEOWIfsQXmL/r - I0/AXP0zSgTlh6pH/YDZdxJ6CObZHphmmFE7YRtwOJw77j4JG8kpkjlSQ9JGMhayNLIN - cm/yVxSWFGOUrpTfqJKpWambaExplmlT6fjpHtH7M1AxtOCPM+IYW5m8mBmYB1kSWBVZ - 19husvtw8HLMcl7mcuXm5V7muc0by2fIT8c/I1AvmCB0VJhD+LtIn2iBmL+4hgS9xGfJ - Hqkq6WKZQtkiuUL5MoWrio1K95SfqMyqbqhTawhpmmj5aefodOgu69MbGBqeNLpl3GnS - ZfrIbOTI+NHn5jMW7y2/WW1bH9hi7ajt8Q5cjkJOcs7qxwyOW8A7kpdbKCHe/SyxxKPa - s99r00fI19ov1f9ewNcgvmDXkKLQ8XCyCP3I01FdJ/ZiVGKj41rit07JJYSdbkvcS9ZO - SU0dPsN4NvBcTwbH+dgL05kKWYXZiBy/3Il8vYK7RSLFFaUcl0vL2MrLKvmrbl2Tu36/ - xqD29c2MOqsGjsavTX3Nua1h7dYdcp3sDyi79ns2H2717zwmHcKPSD3VH/N5dn7Sdhr5 - vPtl8mvNN79muuYyFkwXqZeefkhZ1vy0vlLxVe/bu7WEH/j1ip/Cm43bsju39+T3b/6O - vxYIBaWgFyzBuwY/pAsRoASoFLoH13m2EawIDQQRkQHXcN4jWZDWyDzkLFyPOYmaQIug - k+GsQgNTgcVhQ7EzOAtcH4k6yT1STdJHZBZkc+SRFJQUdZTecKXiM3UzTRKtDZ0YPY7+ - E8MY/h5jHVMV8xWWctZrbDfYqzkucxZyFXAX85TzVvM18XcIDAq+EFoU3hTFijGLi8AZ - h41UkHSeTK/suryAwnHFYqVpFTbV42o16t80NbTStWd1JfVS9F8ZyhpdNP5p6mL25Kiq - eZ0lr1W5DZNtgT2DQ4kTv3P9cVWXYbdjhG/EDE8OryofXt9Cf4aArCBccHLITlhg+Gzk - kajuaImY0jhsfNTJ+QST0/eSxJPLUmnSks78hLPGxfPOF55kamTVZXPmnMtdg5/X3iKe - 4qSSxcu6V8rKdivsK5uukl/zhCNGXxt+Y/gWZ114/WAj9+3YpqlmkZbU1nftWndLOzY7 - 7e63ddF2h/U8eyjXl9+/MeDyuGuIa/jMyNenlqOd4wLPsibWpxynh1+YvRx4ffTN5IzH - 7If5gIXlRaelvg+CHxOXn3wmW1H9Qvh66lva6pm1lO8+P/TX8esLGxU/bTZxm9e2tLfe - bB/fntlx3RndldnN293ac94r25vd59x32y/fn/vF/cvh14Vfvb82D8QO3A7yDn7nj+Fe - sjKHuweAyHXg8uPMwcEPAQCw2QDsXzo42K08ONivgskG/A2kO+DP94pDYwxccy9NOkS9 - daunD6//fvwXs+2dYAplbmRzdHJlYW0KZW5kb2JqCjIxIDAgb2JqCjU5NTYKZW5kb2Jq - CjE1IDAgb2JqClsgL0lDQ0Jhc2VkIDIwIDAgUiBdCmVuZG9iagoyMiAwIG9iago8PCAv - TGVuZ3RoIDIzIDAgUiAvTiAxIC9BbHRlcm5hdGUgL0RldmljZUdyYXkgL0ZpbHRlciAv - RmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngBhVJPSBRRHP7NNhKEiEGFeIh3CgmVKaysoNp2 - dVmVbVuV0qIYZ9+6o7Mz05vZNcWTBF2iPHUPomN07NChm5eiwKxL1yCpIAg8dej7zezq - KIRveTvf+/39ft97RG2dpu87KUFUc0OVK6Wnbk5Ni4MfKUUd1E5YphX46WJxjLHruZK/ - u9fWZ9LYst7HtXb79j21lWVgIeottrcQ+iGRZgAfmZ8oZYCzwB2Wr9g+ATxYDqwa8COi - Aw+auTDT0Zx0pbItkVPmoigqr2I7Sa77+bnGvou1iYP+XI9m1o69s+qq0UzUtPdEobwP - rkQZz19U9mw1FKcN45xIQxop8q7V3ytMxxGRKxBKBlI1ZLmfak6ddeB1GLtdupPj+PYQ - pT7JYKiJtemymR2FfQB2KsvsEPAF6PGyYg/ngXth/1tRw5PAJ2E/ZId51q0f9heuU+B7 - hD014M4UrsXx2oofXi0BQ/dUI2iMc03E09c5c6SI7zHUGZj3RjmmCzF3lqoTN4A7YR9Z - qmYKsV37ruol7nsCd9PjO9GbOQtcoBxJcrEV2RTQPAlYFH2LsEkOPD7OHlXgd6iYwBy5 - idzNKPce1REbZ6NSgVZ6jVfGT+O58cX4ZWwYz4B+rHbXe3z/6eMVdde2Pjz5jXrcOa69 - nRtVYVZxZQvd/8cyhI/ZJzmmwdOhWVhr2HbkD5rMTLAMKMR/BT6X+pITVdzV7u24RRLM - UD4sbCW6S1RuKdTqPYNKrBwr2AB2cJLELFocuFNrujl4d9giem35TVey64b++vZ6+9ry - Hm3KqCkoE82zRGaUsVuj5N142/1mkRGfODq+572KWsn+SUUQP4U5WiryFFX0VlDWxG9n - Dn4btn5cP6Xn9UH9PAk9rZ/Rr+ijEb4MdEnPwnNRH6NJ8LBpIeISoIqDM9ROVGONA+Ip - 8fK0W2SR/Q9AGf1mCmVuZHN0cmVhbQplbmRvYmoKMjMgMCBvYmoKNzA0CmVuZG9iagox - MyAwIG9iagpbIC9JQ0NCYXNlZCAyMiAwIFIgXQplbmRvYmoKMjQgMCBvYmoKPDwgL0xl - bmd0aCAyNSAwIFIgL04gMyAvQWx0ZXJuYXRlIC9EZXZpY2VSR0IgL0ZpbHRlciAvRmxh - dGVEZWNvZGUgPj4Kc3RyZWFtCngBhVTPaxNBFP42bqnQIghaaw6yeJAiSVmraEXUNv0R - YmsM2x+2RZBkM0nWbjbr7ia1pYjk4tEq3kXtoQf/gB568GQvSoVaRSjeqyhioRct8c1u - TLal6sDOfvPeN+99b3bfAA1y0jT1gATkDcdSohFpbHxCavyIAI6iCUE0JVXb7E4kBkGD - c/l759h6D4FbVsN7+3eyd62a0raaB4T9QOBHmtkqsO8XcQpZEgKIPN+hKcd0CN/j2PLs - jzlOeXjBtQ8rPcRZInxANS3Of024U80l00CDSDiU9XFSPpzXi5TXHQdpbmbGyBC9T5Cm - u8zuq2KhnE72DpC9nfR+TrPePsIhwgsZrT9GuI2e9YzVP+Jh4aTmxIY9HBg19PhgFbca - qfg1whRfEE0nolRx2S4N8Ziu/VbySoJwkDjKZGGAc1pIT9dMbvi6hwV9JtcTr+J3VlHh - eY8TZ97U3e9F2gKvMA4dDBoMmg1IUBBFBGGYsFBAhjwaMTSycj8jqwYbk3sydSRqu3Ri - RLFBezbcPbdRpN08/igicZRDtQiS/EH+Kq/JT+V5+ctcsNhW95Stm5q68uA7xeWZuRoe - 19PI43NNXnyV1HaTV0eWrHl6vJrsGj/sV5cx5oI1j8RzsPvxLV+VzJcpjBTF41Xz6kuE - dVoxN9+fbH87PeIuzy611nOtiYs3VpuXZ/1qSPvuqryT5lX5T1718fxnzcRj4ikxJnaK - 5yGJl8Uu8ZLYS6sL4mBtxwidlYYp0m2R+iTVYGCavPUvXT9beL1Gfwz1UZQZzNJUifd/ - wipkNJ25Dm/6j9vH/Bfk94rnnygCL2zgyJm6bVNx7xChZaVuc64CF7/RffC2bmujfjj8 - BFg8qxatUjWfILwBHHaHeh7oKZjTlpbNOVKHLJ+TuunKYlLMUNtDUlLXJddlSxazmVVi - 6XbYmdMdbhyhOUL3xKdKZZP6r/ERsP2wUvn5rFLZfk4a1oGX+m/AvP1FCmVuZHN0cmVh - bQplbmRvYmoKMjUgMCBvYmoKNzM3CmVuZG9iago4IDAgb2JqClsgL0lDQ0Jhc2VkIDI0 - IDAgUiBdCmVuZG9iagoyNyAwIG9iago8PCAvTGVuZ3RoIDI4IDAgUiAvRmlsdGVyIC9G - bGF0ZURlY29kZSA+PgpzdHJlYW0KeAHFWMGOGzcMvesreHQO6x1JI2nm2m0KJEiBJjGQ - Q9HDwvWmG9i7je2k6N/3USIl2Q5SAz0Ui2BISUOJz++JnHymt/SZBvyFFCl5T/sNfaAn - ur07WFofyOa/w5puhmUg/tctfKDbXzb79ebP45f7rdk/IpSb5hzOzonsMNM4R1rv6PbV - ztOPz3k3F2NeMkayjiNGr2tcXmMQ5mLNgOPkOGUNb3W+JmDgdI25XOPP4ty+22zvj49f - N3fP2+f9425z3D+uCbkMy3nw0Y4AYFhOQ3JuNsDBupniFGlHPk3Z2pKf3HJOQ8yunxKe - tgxkJyVaY02i4Abi1bBsWA5uHk19NVibI/Kz7MLWFvuNeSVewW+BAPpqcTDAqzHsBiNP - 9WUmYn+OM7Rj1aCciWa0pj/UNjt6QN6v8e9TocLd+/ybDfT+DtADEvzd8IM5A9A5yJgE - FRgNFAOvpJzzcMXBL5UNZ71A4mxSzARN57AYIPMzQ2LY6iBhl/OqrxYHB5Jhf/EUsKIp - iAQrh6qI4LSSi+KR03oP6mYiTIHxBCMiKG7psDZ2zCROgbOPkQkNGwAkuxwzK+D6FPIE - WMVD4jJhqz3gTDIeCjvgaogAdpTYsJBE2RM28vAIDS5RhGu95X0kgBE3ZpaUKdhttFmI - KfMxx8xhkhxXtzCcWcs3I9Rl//BtauQVYarwwNyamho8ydopQQSrik3KHMmjKZMkvyPQ - TM4UZKbMkrwZzA4XeCW3+rK4mSg5a+yQx4wa4DXDXCDJ+immnlERIRylAAKj4REmSIg5 - g3sUxzpAKLg7OuG44Pl3ilk8P6zAOZGUoxsk6seQaKQVbryfQFFjafVAv9Li1QtQz9Hi - SZ6HF3wxY+B4r5ZOrXVgowbll8w1QbYSX581+vFRZp4lmG5XgtPizck8LT6Kr+/hWL/R - 6jW9XBV0wGauMhBUVpbplKVMG4dKnQi7VxZcIQ9E0CvLW1OV5YoaswBRcPje7ZRlocai - LFhVWbAbg0yEK1zQAOqGRhPs00abVWmE0rNVRepxK484M1EWrMYkHufbuOOOXrpy88y+ - wgOzQwdeAWdOJ8qyAyulTNkBYiy2sVYu3qpNa3F3Z3DYUnDYbuAQuyVbDSBJcmxNnm1Z - dGK1+SJZvnbqcRUcg0wKNjAaNHCuEpnDMXZ0LrK4jMlNgUajKgMN/7PKzEKFcKeyK0pp - mlXFVF1Wpf4f4hq6sgW7o0+EK+IaTspWmGMVV5iLIFlcYTovW2HSssWW8oftxh/DbqFG - DSAuYis/eJ822qw2D8GquPS4yh/iVERcsBqDePz74rIgj5Z1tjt82BUR+VIWqpsbvlyv - 7OhrWbejdjha1m1Ah1P0BUvx4dGGD7FbEtYAqq+x1SjsUxf1luJjfStiVo+r+KBx1CrG - VsOHvWskFliXLDFE6uoYxBxnP3aF7HqJmVrjqjyqYFRiq76WdBdkKa7tULjzB9x5K4DR - Hc/6pR3GEX1rrbPleIvN/f7357+e6M3zx0fsvvrUqpU5qVZ9HygEC6lVK7Y7wrBbCBNi - qVbogrJwIotD7NCqVQjn1Srgo6kQhi0lDGzuZ7UP5ClRiAZQt1WrgH3aaLPQz+ZOJ+BM - HJMvZD1utwVSkbYHViNMyf6yWhn+RMitmUXLUwUFu8OHp0RQsVQsdVNXsNLUBKXfXa1g - 4dtKBAVL8bGwO3zYLYlZCaCCwsdGFQxsWXRitflWsKweV38Cw6m0fBs+Jft/bwwDd5MX - gprxVYkPUX/B2Gs6w2sE9U5r1hfp2rRW3fRSw/d5/QAUqelxTwQWluMY+T8EzgWG45Z2 - 0Cx2uuOFuF/q3l91ibaQex04razfCqYxjt+/KfjSu+gQxnk5WB/Rh192COddbr2jaqOs - nbMe+vh3OXVrEH6ua/WUdUCb5goKUm5d89t/ABckhykKZW5kc3RyZWFtCmVuZG9iagoy - OCAwIG9iagoxNDM5CmVuZG9iagoyNiAwIG9iago8PCAvVHlwZSAvUGFnZSAvUGFyZW50 - IDQgMCBSIC9SZXNvdXJjZXMgMjkgMCBSIC9Db250ZW50cyAyNyAwIFIgL01lZGlhQm94 - ClswIDAgMTE1MiA3MzNdID4+CmVuZG9iagoyOSAwIG9iago8PCAvUHJvY1NldCBbIC9Q - REYgL1RleHQgL0ltYWdlQiAvSW1hZ2VDIC9JbWFnZUkgXSAvQ29sb3JTcGFjZSA8PCAv - Q3MyIDEzIDAgUgovQ3MxIDggMCBSID4+IC9Gb250IDw8IC9GMS4wIDE0IDAgUiA+PiAv - WE9iamVjdCA8PCAvSW0yIDExIDAgUiAvSW0zIDMwIDAgUgo+PiA+PgplbmRvYmoKMzAg - MCBvYmoKPDwgL0xlbmd0aCAzMSAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0lt - YWdlIC9XaWR0aCA1NzggL0hlaWdodCAzOTQgL0ludGVycG9sYXRlCnRydWUgL0NvbG9y - U3BhY2UgMTUgMCBSIC9JbnRlbnQgL1BlcmNlcHR1YWwgL1NNYXNrIDMyIDAgUiAvQml0 - c1BlckNvbXBvbmVudAo4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3Q - MQEAAADCoPVP7WkJiEBhwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGPjAAG1SAAEKZW5kc3RyZWFt - CmVuZG9iagozMSAwIG9iagozMDAzCmVuZG9iagozMiAwIG9iago8PCAvTGVuZ3RoIDMz - IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDU3OCAvSGVp - Z2h0IDM5NCAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAv - Qml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4 - Ae2b+zvU6/f/CzkNM2jQYGSM7ZxTDpkuQjY5lyhlczlsQg5dbE1d00aym7CjXBQlElLO - KVS7rs+/9l33oAOK/W5/917rZa0f9qE085z1eFz3ve57Xu3bx8Ud4A5wB7gD3AHuAHeA - O8Ad4A5wB7gDaDuwn2tPdeAfE1F0zexTmXPtgQ58wm0m6P+ISuvumJtbWFgc4NpjHQDo - 5uYmmf5Hi0z6gDyib5ZWVtYbZcMl6Q5scLa2srIU7Nc0+tsSrekjVh5LcMfGxlYGZQdl - zyX5DgjOgretjY21tdAIFiNYi/6WRGLyEauPJdgD8tjZy+UKhYODI9ce6YCDg0Ihl9uD - SLZgkZDI5NBuRyKxAIE/sPrYyGQgD5jjdFCpdHZ2cXFx5ZJ8BwCzs7NSedDJ0dEBNJLJ - bMRKJBza5TK05s8BK2tbmZ1cIeQBb1Rubm7u7h4eHmouiXcAILu7A26Vq6uL0Eght5PZ - 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 - gDpDy3qbN0QLbdi5koV+T2Eewv8BoF6riFxLUFU6KDrAuWaRHJbDBJZZSJY/8W+Jpgj7 - xNUTvIW04tWXU0fDq4pYyOLilEa10tcvbvrqNH3aOdz0IZWzh1OEv3BPse9DyH3v9E+l - +jXdd+3qm7W8bw9Y5HhoyTPPvlxBeBHEZ5p//X/kjVMmCmVuZHN0cmVhbQplbmRvYmoK - MzYgMCBvYmoKMjU1NgplbmRvYmoKMzQgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVu - dCA0IDAgUiAvUmVzb3VyY2VzIDM3IDAgUiAvQ29udGVudHMgMzUgMCBSIC9NZWRpYUJv - eApbMCAwIDExNTIgNzMzXSA+PgplbmRvYmoKMzcgMCBvYmoKPDwgL1Byb2NTZXQgWyAv - UERGIC9UZXh0IC9JbWFnZUIgL0ltYWdlQyAvSW1hZ2VJIF0gL0NvbG9yU3BhY2UgPDwg - L0NzMiAxMyAwIFIKL0NzMSA4IDAgUiA+PiAvRm9udCA8PCAvRjIuMCA1MCAwIFIgL0Yx - LjAgMTQgMCBSID4+IC9YT2JqZWN0IDw8IC9JbTUgNDAgMCBSCi9JbTQgMzggMCBSIC9J - bTcgNDQgMCBSIC9JbTggNDYgMCBSIC9JbTYgNDIgMCBSIC9JbTkgNDggMCBSID4+ID4+ - CmVuZG9iago0MCAwIG9iago8PCAvTGVuZ3RoIDQxIDAgUiAvVHlwZSAvWE9iamVjdCAv - U3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4IC9IZWlnaHQgMTIyIC9JbnRlcnBvbGF0ZQp0 - cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayA1 - MSAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+Pgpz - dHJlYW0KeAHt0AENAAAAwqD3T20ON4hAYcCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGPgYGb4QA - AQplbmRzdHJlYW0KZW5kb2JqCjQxIDAgb2JqCjE0OAplbmRvYmoKMzggMCBvYmoKPDwg - L0xlbmd0aCAzOSAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0 - aCAyNjAgL0hlaWdodCA3MiAvSW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAxNSAw - IFIgL0ludGVudCAvUGVyY2VwdHVhbCAvU01hc2sgNTMgMCBSIC9CaXRzUGVyQ29tcG9u - ZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dABDQAAAMKg909t - DjeIQGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMPA0MNtgAAEK - ZW5kc3RyZWFtCmVuZG9iagozOSAwIG9iagoyNjgKZW5kb2JqCjQ0IDAgb2JqCjw8IC9M - ZW5ndGggNDUgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGgg - NzggL0hlaWdodCAxNjQgL0ludGVycG9sYXRlCnRydWUgL0NvbG9yU3BhY2UgMTUgMCBS - IC9JbnRlbnQgL1BlcmNlcHR1YWwgL1NNYXNrIDU1IDAgUiAvQml0c1BlckNvbXBvbmVu - dAo4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QAQ0AAADCoPdPbQ43 - iEBhwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwICB74EBlegAAQplbmRzdHJlYW0KZW5kb2JqCjQ1IDAgb2JqCjE5 - MQplbmRvYmoKNDYgMCBvYmoKPDwgL0xlbmd0aCA0NyAwIFIgL1R5cGUgL1hPYmplY3Qg - L1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA3OCAvSGVpZ2h0IDk4IC9JbnRlcnBvbGF0ZQp0 - cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayA1 - NyAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+Pgpz - dHJlYW0KeAHt0AENAAAAwqD3T20PBxEoDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQP/AwNZlAABCmVuZHN0cmVhbQplbmRvYmoKNDcgMCBv - YmoKMTIzCmVuZG9iago0MiAwIG9iago8PCAvTGVuZ3RoIDQzIDAgUiAvVHlwZSAvWE9i - amVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4IC9IZWlnaHQgMjI0IC9JbnRlcnBv - bGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9T - TWFzayA1OSAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURlY29k - ZSA+PgpzdHJlYW0KeAHt0IEAAAAAw6D5U1/hAIVQYcCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMDAOzDMwAABCmVuZHN0cmVhbQplbmRvYmoKNDMgMCBvYmoKMjUyCmVuZG9iago0OCAw - IG9iago8PCAvTGVuZ3RoIDQ5IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1h - Z2UgL1dpZHRoIDc4IC9IZWlnaHQgMjYwIC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNw - YWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayA2MSAwIFIgL0JpdHNQ - ZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt0AEN - AAAAwqD3T20PBxEoDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBh4GxjtqAABCmVuZHN0cmVhbQplbmRvYmoKNDkgMCBv - YmoKMjg4CmVuZG9iago1MSAwIG9iago8PCAvTGVuZ3RoIDUyIDAgUiAvVHlwZSAvWE9i - amVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4IC9IZWlnaHQgMTIyIC9Db2xvclNw - YWNlCi9EZXZpY2VHcmF5IC9JbnRlcnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50 - IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7ZnpW5JpG8ZtMhdAFmUT - RBAQZBNBDMUFFMN91wZTicIoDCU9ophQ00wpylzS3IrUXCbN0nHSmqlj/rW57genRsVx - 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 - DBqVgmJADAYLevjD9OATGnqF6oIhJQnlnTQUdjKZiQdiMuGSTkOZZzDyhEwRJbKhYFiv - KIzFAtRgFgsZanxCAsSoSPAgHrLTgzw2GJ+eDMNwWLgL9cViMXEc5LuHFYeCXTxkxd+j - 4sMhyt+uDoJnVCCWYUN8jQPB3yMECJ6ALBvLsU+PsbG1gKj7r3g9Cin6m7BLLHYPokLP - /2/VIR7cK0hY6h95RNiTwdf/Xf6P2PCboOBfHf0ZfO1QBeGL8AT+JxP4ExhzFIkKZW5k - c3RyZWFtCmVuZG9iago1MiAwIG9iagoyODY5CmVuZG9iago1NyAwIG9iago8PCAvTGVu - Z3RoIDU4IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4 - IC9IZWlnaHQgOTggL0NvbG9yU3BhY2UKL0RldmljZUdyYXkgL0ludGVycG9sYXRlIHRy - dWUgL0JpdHNQZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJl - YW0KeAHtmelPWlkYxl1QZAdFUJYBL24XRHorFhUtGIi7dcViK0ZFTbEo1UgkdSnGKpG4 - thqXuNW4RK1RQ9SYtum/Nu+9Ou2oOE4zN/NhxueDApKfz/uec+4957khIQ/6/3Qg9E79 - Ug+AEvZT4X/Sz0/D4Et/A3pJAgKFEnGHKBT4Mw6+D0iwLkGRVGrUpWhXunpLpUbCvwHk - PbwrVkREJIBodDqDwWAymawfgjfwEZ1Oi4rCiX/Nw2HhUB+gAMRksdkcLpd3TVwuh81m - AZMOwEveHeUSMPCFs1hsDo8XHcPnx8YKBMIrCQSxsXx+TDSPx2GzcB74g3KD43BnuDGc - xQWSQBgXLxKJJRLplSQSsUgUHycUAJFL8MAejgsyuAQMGsZgAgtQwJHK5PIERPFDSIJc - LpMCE4DAYzLw9gXHheI9o9LAGC9GECcCEqJISk5JRVGlUgVSKlE0NSU5SYEAURQniOGB - PRoVH4vb5sAawKIYLA6PLxRJ5UhiMqpMU2s0GIY9JgQvNBp1mhJNTkTkUpGQz+OwwF0E - JUitYA0GgE7AxDIkKVWl1mAZmU902TkgvR7/ma17kpmBadSq1CREJiZwdBiKIOZCwVoU - ncnm8ePEMkWKKh3T6rL1eQZjvslkMoPgV77RkKfP1mmxdFWKQiaO4/PYTHoUmLtZ6qU1 - BsCEYnkiqsa0WXpDvrmgqLi0rPwZofKy0uKiAnO+QZ+lxdRoohx3x2YEM4fToE4uwGSJ - qCZDl2s0FZaUV1TXWOqsV6qz1FRXlJcUmoy5ugwNmogXy2WBuVulQqGRUQx2tEAkU6Dp - 2hyDubisqtb60tbY1GK3t4Ls9pamRttLa21VWbHZkKNNRxUykSAaN3er1NAwmB1gLU6K - pKgzcowFpZWWeluTvd3x2tnZ5QJ1dTpfO9rtTbZ6S2VpgTEnQ52CSOPAHMySm43DC4Wu - CUTyJBWmMxSUVVsbmtscTldPr7vPQ6jP3dvjcjramhus1WUFBh2mSpKLBHjnoNTry4Gg - cWKEUiQ1XZtrBlij3dHZ7fb0Dw55hwl5hwb7Pe7uToe9EXDmXG16KiIVxnCC0iJpTC4/ - XpaowrKMxZXWxtYOl9sz6B0Z9Y37CY37Rke8gx63q6O10VpZbMzCVImyeD6XSYu85Y0S - SWPhhSartXpTuaXB3vHG3e997/NPTs98IDQzPen3vff2u9902Bss5Sa9Vp2Ml8qiwTDc - qJRCpbOjhRIkVaN7WlhV3/zK5e4fHvNPzc7NLy4ugRYX5+dmp/xjw/1u16vm+qrCpzpN - KiIRRrPp1CA0BhvaplBi2fkltbY2J8B8EzNzC8sra+sboPW1leWFuZkJH+Ccbbbakvxs - TKmAxrEZQWgwpPz435LSMqBQa5Oj2/NubGJ2fml1Y3Nrewe0vbW5sbo0Pzsx9s7T7Wiy - QqkZaUm/xfNhUG95gwnC4eNty8wrqHhhd7oHRvwz88trn7Z39/YPQPt7u9uf1pbnZ/wj - A26n/UVFQV4m3jg+Pqg3+wY0LtBSNDpDUbWt3eXx+qbmltY2d/YPDo+OQUeHB/s7m2tL - c1M+r8fVbqsuMug0KUDjBqUxubGiBBgEY3FNo6Pn7Yh/dmEVYIfHJwFCJ8eHgFtdmPWP - vO1xNNYUG2EYEkSxXGYwb0xerBhBH2Xnl1qaOnoHRic/Lm9s7x0eB07PzkFnp4Hjw73t - jeWPk6MDvR1NltL87EcoIo7l3UETSBAUyzGV1bU43UO+qfmVzd3PR4HT8wtC56eBo8+7 - myvzU74ht7OlrsyUg6GIRHA3DSYI0J7bO/u849MLa1t7hycA+/IV9OXi/PTkcG9rbWF6 - 3NvXaX+O05SKe2nlVnuXZ9g/u7i+vX8UOAPYNxDgzgJH+9vri7P+YU+XHabIXTS4IEUx - eQIJ4S0I7fv3e2jXruWh4RGwTGEpqB7rzc+srS7w9mFpY+fgOHB+8fXbd9C3rxfngeOD - nY2lD+DN1Wp9ZtY/VsFigIUaEf5Ae+jbwwx5WAsP15CHq+W/dV8g9Q4Ycg/t1+7O12ik - 7RzI3NWQuuMidTdI7k6VzF00hdQdPoVK6umD3JMRqae2cFJPlPjZmcTTLpkncXJTArIT - DHLTFTyUIiv5CSE1lQIauYkZmWkebo68pBFoeK1kpaCXOLIS2hBy0+NLHFnJdgiBI5Jy - MlJ3yKmuUnz80cI/fiKAx14EL4ycpxVEjEbikxSC9wcUuMH08zsPr/77HfgdD5HCnApl - bmRzdHJlYW0KZW5kb2JqCjU4IDAgb2JqCjE2NzgKZW5kb2JqCjU1IDAgb2JqCjw8IC9M - ZW5ndGggNTYgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGgg - NzggL0hlaWdodCAxNjQgL0NvbG9yU3BhY2UKL0RldmljZUdyYXkgL0ludGVycG9sYXRl - IHRydWUgL0JpdHNQZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+Pgpz - dHJlYW0KeAHtmutXUmkbhzt4ApGDAipIKKCyRUQUQ0ETR1JRMbVoUJNU1BnMU64wGg9h - pky8eWp0PJRkjIel5WjDm67W1Opfe+/nAUsTslnr/Tb790EE8fK+n2dvNnhf586R+fes - wPmQ+UdrAJQLX3LxWL48egGe9B1QPwkIYWHhIRIWBj9G4LOAmOUHRURGRvlDCSRwNzIy - Av4MIM/gBVjh4REAolCp0dHRNBot5nPgDjxEpVKiohDx2zwEuwj9AQpAtBg6ncFksk6E - yWTQ6THApALQzwvRLoZBXYgVQ2ewWLFxbDaHw+XGB8Llcjhsdlwsi8WgxyAe1AftBseh - ylBhiMUEEjc+IZHH4yclCQJJSuLzeIkJ8VwgMjEPykO4IJuLYbBg0TRgAQo4AmFycopI - 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 - KYjQ7orfq4FWkbyCvJrmts6unv4B+6DjAY5j0D7Q39PV2daMvBqkruBGg3k1yPlBOlKi - QCyVq8D5qa4zNVpa23+yBZQfLP3YfmpvtTSa6gCmUcmlYgGIMDHU087PMR8J5KY8je6q - wVhvMjdZWlqt1g4cq7W1xdJkNtUbDVd1GuhT8g0fCWlc2JUC8Uqhyi/S6SuqamrrkSrV - 0NDY2NBgNt801dfWVFXodUX5KoAh9Qq7UkHsJqSYIY8rIQlwWcq8gkLdD1fLDZWgcV3D - qTFWVxrKr/6gKyzIU2YBLAlpYUE9rnMBx4zB4iCcNFMBjpmm8ApSzPRXccAyK9FdKdSA - Y6bIlCIYh8UI7pgBDRcXw4jlIGUtjZBlZeeoLqvzkfxWCEEKXL76sionO0tGpCFhjROL - dLoQ/ttJN0+cmk7IMrMU2aDm5eLkKJXZiqxMGZGeKj7LzcPFYW8QqX6JfIEwRSzxa4PI - GkTxi4MScYpQwE/0i35ghJ321dBbYL/TGEXxO43xCTy+4JIwoDRKIMhsBKlReEnA5yXE - +51GCu7za8MMv6HGHiIokuBbMlixbA74lid0S4EAC5fgW3LYschApCJBMpiDiIvD1YHX - SAm4oH4V9MgERbd+GTTgglKQWxrSBUW9IucSygPecU01FgcLq0eiKpivqDCABe3zc3XI - ewVXFRG/KLSguqIEJFpwaGHBgBW6siMcrg+AR37vkd2LbrHhC34vFnxRXSGUV7wP8AUE - ZfSkE+pxRCCfVWQkH/tRJ3SaI8bJ2wDRTz1mReNv0aMo8KSTv/Xte/D0kPn2b5I/JVcg - 5Ar8DwX7gnsKZW5kc3RyZWFtCmVuZG9iago1NiAwIG9iagoyNjU0CmVuZG9iago1OSAw - IG9iago8PCAvTGVuZ3RoIDYwIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1h - Z2UgL1dpZHRoIDc4IC9IZWlnaHQgMjI0IC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5IC9J - bnRlcnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVE - ZWNvZGUgPj4Kc3RyZWFtCngB7ZvrU1JbGMY1Ue435aJcgjYoN5F2UqRo4MCgpqZZFF1g - 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 - isK0Psn7EwrcXPrxHvTovz8CfwCRudNLCmVuZHN0cmVhbQplbmRvYmoKNjAgMCBvYmoK - MTc5MwplbmRvYmoKNjEgMCBvYmoKPDwgL0xlbmd0aCA2MiAwIFIgL1R5cGUgL1hPYmpl - Y3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA3OCAvSGVpZ2h0IDI2MCAvQ29sb3JTcGFj - ZQovRGV2aWNlR3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAvQml0c1BlckNvbXBvbmVudCA4 - IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae2c+08aWRTHtaLIGxRBeSw4 - iAqIdCoWlbZAIL5tfWHpQ2NFm2JRqikpqbbFWCUSn63ER9RaU2zUGjVEjWmb/mt7ZnTb - WnHdZuen3fv9QZ75eM65c+fynck9CQlI/58KJJ6r36oBUC79UNJP+vHuJfjSP4Aek4BA - oyWfIxoNPibAFwFJ1jEohU5PPRbjRCcv6fQU+DeAvIB3wkpOTgEQg8lksVhsNpvzXfAC - 3mIyGampBPHveQQsCfIDFIDYHC6Xx+cLTonP53G5HGAyAXjMOyddEgZxESwOlycQpKUL - hRkZIpH4RCJRRoZQmJ4mEPC4HIIH8UG68XFEZERgBIsPJJE4M0sikcpk8hPJZFKJJCtT - LAIin+RBeAQuzuCSMCgYiw0sQAFHrlAqszHVd2HZSqVCDkwAAo/NIsoXH5dI1IzOgMAE - 6aJMCZAwlTo3L1+j0Wp1IK1Wo8nPy1WrMCBKMkXpAgiPQSfG4mxwEBrAUlkcnkAolsiV - WE6uRlugNxhwHL9CCp4YDPoCrSY3B1PKJWKhgMeB6JJpcXKF0GAAmCRMqsDU+Tq9AS8q - vmoqLQOZzcTfUtPV4iLcoNflqzGFlMQxYSjiBJcIoaUy2VyBMFOqUOXpCnGjqdR83WK1 - 2e12BwgebFbLdXOpyYgX6vJUCmmmUMBlM1MhuF9TPQ6NBTCxVJmj0ePGErPF5iivrKqp - rbtJqq62pqqy3GGzmEuMuF6ToySi47LiBUfQIE8+wBQ5GkOR6ZrVXlFdd6uxydniOlGL - s6nxVl11hd16zVRk0OQQyfI5ENyZVCHRlFQWN00kUag0hcYyi6OqtqHZda+1rb3D7e4E - ud0d7W2t91zNDbVVDkuZsVCjUkhEaURwZ1JNvARHB4SWKcfy9EVl1vKaeued1nb3Q89j - b0+vD9Tb433seehub73jrK8pt5YV6fMweSYEB0fJr4UjEoWqiSRKtQ43WcprG133H3R5 - vL7+p/5nAVLP/E/7fV5P14P7rsbacosJ16mVEhFROUj19HQgabx0sRzLLzRecwCsze3p - 6fMHBl68DA6RCr58MRDw9/V43G2Ac1wzFuZjcnE6Ly4thcHmC7MUOTq8xFpV72rr7Pb5 - Ay+CwyOhsTCpsdDIcPBFwO/r7mxz1VdZS3BdjiJLyGczUs7ERkthcIhEc/VGs73Oed/d - /cQ/EHwdCk9MTb8hNT01EQ69Dg74n3S77zvr7GajPpdIlcOAYfglUxqdyU0Ty7B8g+lG - RcOdB498/oGh0fDkzGxkfn4BND8fmZ2ZDI8ODfh9jx7caai4YTLkYzJxGpdJj0NjcaFs - Ki1eaqtubu3yAiw0Pj07t7i08m4V9G5laXFudno8BDhvV2tzta0U16qgcFxWHBoMqTDr - D3VBESTqavf0BV6Njs9EFpZX1z5E10HRD2urywuRmfHRV4E+T7sLUi0qUP+RJYRBPRMb - HCA8IVG24uvlt+66vf7B4fB0ZHHlffTjxuYWaHPjY/T9ymJkOjw86Pe6794qv15MFE5I - DOqvdQMaH2h5BpOlsrH1oS8QDE3OLqysrW9ube/sgna2tzbX11YWZidDwYDvYWtjpcVk - yAMaPy6Nzc+QZMMgWKua2jz9z4fDM3PLANve3YuR2tvdBtzy3Ex4+Hm/p62pygrDkC3J - 4LPjxcYWZEgxzeVSW42zvfvp4MjE28XV6Mb2bmz/4BB0sB/b3d6Iri6+nRgZfNrd7qyx - lV7WYNIMwTk0kQzT4GX22pYOr/9laDKytPbx005s//CI1OF+bOfTx7WlyGTopd/b0VJr - L8M1mEx0Pg0OEKDddvc8C45Nza182NjeA9jnL6DPR4f7e9sbH1bmpsaCz3rctwmaVnUh - rc7l7g0MhWfm30U3d2IHAPsKAtxBbGcz+m5+JjwU6HXDIXIeDU5IqWyBSEbGFof27dsF - tFPn8sSkZJimMBV0V8yOm65OH8T2ZmF1fWs3dnj05es30NcvR4ex3a311YU3EJuv03XT - Yb6ig8kAEzU5CdFQ3dARguYCOoegsyVaFxLQeop+OaDfSMfmDc0FNBfQXEBzATlK5J1/ - vpyH1gW0LqB1Aa0LaF1A6wJaF9BVd3R/Ad1JQXeg0L02dFcROSPkjJAzQs4IOSPkjJAz - Qs4IOSPkjJAzQs4IOSPkjJAzQs4IOSPkjJAzQs4IOSPkjJAzQs4IOSPkjCh2RpTuLky4 - gPZ7Ox9P0SjblUnljlFKd7NSutOW2l3AVO5QplG6e5pGp3RnN7W7zindEZ9E6W59oi8B - hZ0EqOxyQG0HBqq7Q1DbuYJo+EFVV40ESjt+AI3abiRUdkohgqOuiwvQiFyp6jBzjKOq - +00CtZ15jnFUdQ1KIHFkFyIqOhqB0T/pkES0bfrX3ZaI6wYk7xI1naDI6xAUdqkieX9B - gRtPP76Dnv33K/AnPYiO7wplbmRzdHJlYW0KZW5kb2JqCjYyIDAgb2JqCjE4MjAKZW5k - b2JqCjUzIDAgb2JqCjw8IC9MZW5ndGggNTQgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0 - eXBlIC9JbWFnZSAvV2lkdGggMjYwIC9IZWlnaHQgNzIgL0NvbG9yU3BhY2UKL0Rldmlj - ZUdyYXkgL0ludGVycG9sYXRlIHRydWUgL0JpdHNQZXJDb21wb25lbnQgOCAvRmlsdGVy - IC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHtm+tTUmsUxtFQ5A7KRUECNyICIu0jhteA - wVFRPN4NSx2VdMIw0pFi8tqYUozXk4yXUTPLTMvRxrSp88+d9aLlHMXq65b9fOKDzuz1 - 43nW2uy9XgqFFEmAJEASIAmQBP6EQMwV05/U/PNvoPbYM10jvM5qiYXSfpZ5+YeT+qFu - KjXuSolKhaIQjt9hCBM4KT+eRks4EZ3QOi2CRouHrxRA/IbCKYG4uHgon85gMJlMFovF - JrigBCiEwaAnJCAOv6aAEFyDBAAAKJ/F5nC4PB7/CojH43I4bCDBAAwnFC4JRBgBeAAR - YHO4fH5ikkAgFIpEYkJLJBIKBYKkRD6fy2EjCuAFCERkCMgFyASIAA/qF4mTUyQSaWqq - jNBKTZVKJCnJYhFw4IUpgBUQhAhzIYwAGgGTBQQAAFQvkysUaZiS4MLSFAq5DEgABqDA - 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 - 1NoEGeUGFOBBVED9Bnw4y550jaVWFkmAp8GgI1XnaJiZsO9FHja7z2pQ1TAcGaAxYmlY - g9XObFgXn8OxJkXAjpURiX880KrMJzzSDsKtMN+mFFGfpHKC0iC+bZk21PmTNIRGs6vX - uBpXI6/V4hp/WYkBcYj5BoUzNBYdFq2SqiMNWUVqoZ9yJaZN5Q4cIz0chzxAdVlEr51w - MfMMaH6Ralux0sD4H1pCEyqk2h75OP0lhTYY/pIiUsvdkn6ZXTRTlpKUNlCEJCmiOSKI - d/8CItXGsQplbmRzdHJlYW0KZW5kb2JqCjY1IDAgb2JqCjIyNzkKZW5kb2JqCjYzIDAg - b2JqCjw8IC9UeXBlIC9QYWdlIC9QYXJlbnQgNCAwIFIgL1Jlc291cmNlcyA2NiAwIFIg - L0NvbnRlbnRzIDY0IDAgUiAvTWVkaWFCb3gKWzAgMCAxMTUyIDczM10gPj4KZW5kb2Jq - CjY2IDAgb2JqCjw8IC9Qcm9jU2V0IFsgL1BERiAvVGV4dCAvSW1hZ2VCIC9JbWFnZUMg - L0ltYWdlSSBdIC9Db2xvclNwYWNlIDw8IC9DczIgMTMgMCBSCi9DczEgOCAwIFIgPj4g - L0ZvbnQgPDwgL0YyLjAgNTAgMCBSIC9GMS4wIDE0IDAgUiA+PiAvWE9iamVjdCA8PCAv - SW04IDQ2IDAgUgovSW00IDM4IDAgUiAvSW05IDQ4IDAgUiAvSW0xMCA2NyAwIFIgL0lt - NyA0NCAwIFIgL0ltMTEgNjkgMCBSID4+ID4+CmVuZG9iago2OSAwIG9iago8PCAvTGVu - Z3RoIDcwIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDI2 - MCAvSGVpZ2h0IDEwMCAvSW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAxNSAwIFIg - L0ludGVudCAvUGVyY2VwdHVhbCAvU01hc2sgNzEgMCBSIC9CaXRzUGVyQ29tcG9uZW50 - CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dAxAQAAAMKg9U9tCU+I - QGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBv4DAzC/AAEKZW5kc3RyZWFt - CmVuZG9iago3MCAwIG9iagozNjQKZW5kb2JqCjY3IDAgb2JqCjw8IC9MZW5ndGggNjgg - MCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggMjg0IC9IZWln - aHQgNzggL0ludGVycG9sYXRlCnRydWUgL0NvbG9yU3BhY2UgMTUgMCBSIC9JbnRlbnQg - L1BlcmNlcHR1YWwgL1NNYXNrIDczIDAgUiAvQml0c1BlckNvbXBvbmVudAo4IC9GaWx0 - ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QMQEAAADCoPVPbQ0PiEBhwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDDwODADpwABCmVuZHN0cmVhbQplbmRvYmoK - NjggMCBvYmoKMzEzCmVuZG9iago3MyAwIG9iago8PCAvTGVuZ3RoIDc0IDAgUiAvVHlw - ZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDI4NCAvSGVpZ2h0IDc4IC9D - b2xvclNwYWNlCi9EZXZpY2VHcmF5IC9JbnRlcnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29t - cG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7Zz7U5L5F8c1 - Ue435aJcFgJvQEgkhUgFLIxFYplpUqsMhjXhYmyNTMxqhesaG5MmrY6XMUNHbdR1tGHM - carZf+17HmDXr/oQ9ON+eN6/4W+fl+ecz+W8z1NURIggQBAgCBAECAL/RQLFBaLv+t8A - k1OHKkFWh2s8BUvOA1GaC/AgkUoLQiQSLBbDlAtPikwaSxmZTEmLiqQyiyOTyyAEAFAO - OhkypaVlgIVKo9HpdAaDwURUsDRYII1GpVAwPt+mg6EpgUwCMICFwWSx2BwOF2FxOGwW - iwmEaIAnTSdLYqXQQMxgZJgsNpdbXsHj8fkCgRBJCQR8Po9XUc7lsllMjA7EDiQWPhws - arCgwchwgItAWFklEoklEimSkkjEIlFVpVAAfDgpOhA6GBycDSuFBgoNnQFkAAxQkcrk - 8tMKJaJSnJbLZVIgBHiADoOOlR18OMVYrSFTIWi4FYJKEXBRKGtq6+pVKrVag5zUapWq - vq62RqkAPqJKQQUXQodKxiryycCBsAE0FDqTzeUJRVK5orpWpT6j1en0ev05BAXL0um0 - Z9Sq2mqFXCoS8rhsJkROKQknqyBsoAzTUmjEMkVNvUar0zeev2A0NYPMiAlbk8l44Xyj - XqfV1NcoZOIUHBoUZJzAKYawodAYLC6vUixT1mka9AajyXzJYrXZ7XYHcoJF2ayWS2aT - 0aBv0NQpZeJKHpfFoFEgcI4nVTps6IBGKJZXq7R6Q5PZYnO0XHW2utquI6g2V6vzaovD - ZjE3GfRaVbUcixwWHS9wMDaQURxAI6tW6RqNF632K9fabnTc6rrtRlK3u2513Gi7dsVu - vWhs1KmqsbTiMCFwTiQVpFQZhc4qF4hkSlWDodnicLpudrp/6vV47/l8/cjJ57vn9fT+ - 5O686XI6LM2GBpVSJhKUY4FzIqmKT8H+DWFTKVXUaRubrS2t7V13er2+B/6fA4OPgsjp - 0WDgZ/8Dn7f3Tld7a4u1uVFbp5BWQuDAPn684GApBdVGIJLXaPRGS4urw93Td98fCD4Z - Cj0NI6inoaEnwYD/fl+Pu8PVYjHqNTVykQCrOJBUR4/GKTbsCqFUUd9guOgANB6ff/Bx - KDz87HlkFEFFnj8bDoceD/p9HoDjuGhoqFdIhRVsXDZlVAaHVyWr1uibrM52t6d/IBgK - P4uMjUdfxRDUq+j4WORZOBQc6Pe4253WJr2mWlbF4zCoZSfihlRGZWIpVas1mO1tXT2+ - gV9Cw5Hfo7GJN1NvEdTUm4lY9PfIcOiXAV9PV5vdbNDWYknFpEIxPpZTJDKNVS6UKOp1 - xstXbt7pexgMDY++jE3Gp2fm5uaR09zczHR8MvZydDgUfNh35+aVy0ZdvUIiLGfRyDhs - 6CwoN0q13mS71tl7PwBooq+npmcXFpfeJ5DT+6XFhdnpqddRgBO439t5zWbSq5VQcFh0 - HDawTfGqfqg50wgp5fb6H4dfvHwdn5l/l1hZXVtHTmurK4l38zPx1y9fhB/7vW5IqsYz - NT9U8WCjOhE3sIWzeVi5OX+p5cZdXyA0MhabmllYWl77sLG5hZw2Nz6sLS8tzEzFxkZC - Ad/dGy2XzmMFh4dtVMfrDbDhAJs6ndFytaP3QTAciU5Ozy+trG9ube/sIqed7a3N9ZWl - +enJaCQcfNDbcdVi1NUBGw4uGwaHLzoNpdjqvOXxP/l1LBaffQdotnc/JhHUx91tgPNu - Nh4b+/WJ33PLaYVifFrE5zDw4obB5YsVqrMmW2uXd2BoZHziz4XE2sb2bnLv0z5y+rSX - 3N3eWEss/DkxPjI04O1qtZnOqhRiPjcLG4FEodI321237wVCz6OTM4srH/7aSe7tHyCo - /b3kzl8fVhZnJqPPQ4F7t132Zr1KIRFkZwNbOLDp9g0+jbx6M7u0urH9EdB8/oKcPh/s - 733c3lhdmn3zKvJ00NeNsVErc7Jpc/sehUdj8bn3a5s7yU+A5ity+vL54FNyZ3Pt/Vw8 - Nhp+5INNPBsbeKKgMLgCSSpucNj8jZi+fpvNkVfR4pJSuE7BsVhzzuy47u4PQty8nU+s - b+0m9w++fEWMDCzn65eD/eTu1npi/i3ETbDffd1hPqeBgzFcqEpLjrLJETcFllNH2BQR - bLLWmyNsiH3q2BtFuhYT55ts55uT52I44KB8Ll7N+1yMc59ahvvUDpr3qR24Ty3ne59K - 38MbDu/hE4VwD584vIc3ZL+HE+832d5vSFne/RYTy2i++y0nFvN99yORj70XDxXKe/FQ - 7vfi7H2GWRT7DLPf02fA+lP8TH/KlelPvUj3p+Lo9afi6f7Ui0x/ypXpT/Fx+1MlJ/qa - /uBQeCTy23j0DwTbmrE/ouO/RUbCQ0F/7r4m5hU47Ie3FlY/vDVHP5zwUWTzUWT13zwc - QNV/M/AwT//NCd+W3elq7+y+2+Px9qHp2+rzenrudne2u5z2nL6ttN+vAvx+YGo74vfr - RtHv133E74dZ2sTCimx+P8xenPGJKtM+0cs2e8oniqJRtM2V8onabZfTPlHlN3yiRSl/ - MRXPX/wjmv7iH/H8xVQ8fzGwwfOlGy4Ym1LGdMzIjZZMTcYLhnx96VnmGc6iOs9wNu95 - Bixwss7BqBHUd8zBABvIKmwS5p/5KVFhzE+J/m9+6tvDZf/M3XH/nbtDdPAOxu7+nbvj - 5pq7Kzo2r8kplHlNGGjNOa+ZhgNzvqlp1kKb881MQeOPskK/Cmc+HN0B8fR4eL7z4Yd0 - sM8tHH5XgILidwUynxWg5PtdAazVmYqdU8T3KDAWOCK+Y4ID5difgFEB6NiiiZ8EAYIA - QYAgQBAgCPz3CfwPSbtUFQplbmRzdHJlYW0KZW5kb2JqCjc0IDAgb2JqCjIxMTgKZW5k - b2JqCjcxIDAgb2JqCjw8IC9MZW5ndGggNzIgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0 - eXBlIC9JbWFnZSAvV2lkdGggMjYwIC9IZWlnaHQgMTAwIC9Db2xvclNwYWNlCi9EZXZp - Y2VHcmF5IC9JbnRlcnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRl - ciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7Zz7T5JtGMc9oMgZFEE5vNCDJ0CkJylU - KnAw09TyHJY6FXVhKOVkstTCWbJYnkrnYabm1Kbm1DF1rtr7r73XjZZLMXt/fOT+/sQP - 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 - NFz4JG0SOpgnF/P4gFaSD68+z00mzQXNAuUGJosj75Yk1txOdt6nHUMCuSX7Vq/Bjqcy - sEOyZAmZW+nky0veDQvSbFzGcgdeb38rzlZI/krc1hZ5wW0N4t+B2+17Rpm4Xm6aS2sI - BCjr6MtCZpBYEAd1eWq+sqRJqJVJWwo+11tg68c0MUD0kxtzYJwCjEQJL+hZS1LQzLM9 - UcwA0TN0iaF00jJi2UtfhO0iIXfWXucy0Knn0TKMU+QywLY8SJizrPOll16d16S57RFs - S5nA5RfrJF1gu7UYaJQlxyhVUjfv0AtoN5IYsWwjF2NYGTm2OqGlOWlCDzth8ZPRmEy6 - Z0qclOSBca5OzBdlKTsnD/xMoSivNsPEWGOWyVSe98OshzstahwK04TLeAs6Rk8Wo+rY - iXYu6wG3/s8JES9MibznA+9NHFz1NWXHk6msh1cn7+fLjuH0dQnw9f8Bl1cm/gplbmRz - dHJlYW0KZW5kb2JqCjc3IDAgb2JqCjI4MjUKZW5kb2JqCjc1IDAgb2JqCjw8IC9UeXBl - IC9QYWdlIC9QYXJlbnQgNCAwIFIgL1Jlc291cmNlcyA3OCAwIFIgL0NvbnRlbnRzIDc2 - IDAgUiAvTWVkaWFCb3gKWzAgMCAxMTUyIDczM10gPj4KZW5kb2JqCjc4IDAgb2JqCjw8 - IC9Qcm9jU2V0IFsgL1BERiAvVGV4dCAvSW1hZ2VCIC9JbWFnZUMgL0ltYWdlSSBdIC9D - b2xvclNwYWNlIDw8IC9DczIgMTMgMCBSCi9DczEgOCAwIFIgPj4gL0ZvbnQgPDwgL0Yy - LjAgNTAgMCBSIC9GMS4wIDE0IDAgUiA+PiAvWE9iamVjdCA8PCAvSW0xMSA2OSAwIFIK - L0ltNCAzOCAwIFIgL0ltMTQgODMgMCBSIC9JbTE1IDg1IDAgUiAvSW0xMyA4MSAwIFIg - L0ltMTIgNzkgMCBSID4+ID4+CmVuZG9iago4MyAwIG9iago8PCAvTGVuZ3RoIDg0IDAg - UiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4IC9IZWlnaHQg - NDM2IC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9Q - ZXJjZXB0dWFsIC9TTWFzayA4NyAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVy - IC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt0DEBAAAAwqD1T20LL4hAYcCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMDAe2COlwABCmVuZHN0cmVhbQplbmRvYmoK - ODQgMCBvYmoKNDY4CmVuZG9iago4NSAwIG9iago8PCAvTGVuZ3RoIDg2IDAgUiAvVHlw - ZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4IC9IZWlnaHQgMTA0IC9J - bnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0 - dWFsIC9TTWFzayA4OSAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0 - ZURlY29kZSA+PgpzdHJlYW0KeAHt0DEBAAAAwqD1T20JT4hAYcCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG/gMDXxAAAQplbmRz - dHJlYW0KZW5kb2JqCjg2IDAgb2JqCjEzMAplbmRvYmoKODEgMCBvYmoKPDwgL0xlbmd0 - aCA4MiAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA3OCAv - SGVpZ2h0IDMyNiAvSW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAxNSAwIFIgL0lu - dGVudCAvUGVyY2VwdHVhbCAvU01hc2sgOTEgMCBSIC9CaXRzUGVyQ29tcG9uZW50Cjgg - L0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dABDQAAAMKg909tDjeIQGHA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgw8DQwqCwABCmVuZHN0cmVhbQplbmRvYmoKODIg - MCBvYmoKMzU2CmVuZG9iago3OSAwIG9iago8PCAvTGVuZ3RoIDgwIDAgUiAvVHlwZSAv - WE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4IC9IZWlnaHQgNDU0IC9JbnRl - cnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFs - IC9TTWFzayA5MyAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURl - Y29kZSA+PgpzdHJlYW0KeAHt0AENAAAAwqD3T20PBxEoDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBh4GBifCwABCmVuZHN0cmVh - bQplbmRvYmoKODAgMCBvYmoKNDg2CmVuZG9iago5MSAwIG9iago8PCAvTGVuZ3RoIDky - IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4IC9IZWln - aHQgMzI2IC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5IC9JbnRlcnBvbGF0ZSB0cnVlIC9C - aXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB - 7Zz5V5JpG8db3FhkURZFFAE3BEWERDEVlyhFxxWjXEIxCwelNJKyFEszmQw1TSwj9ail - ZlqWLVOnf22u+4FpSjBnfnzPe39/SCD4eN3X/Tw8XHLO58gRnP+fDhw9MP+pB0A59k+O - /5B/Hj0GT/oXUB8JCCEhoQckJAT+G4EPAxIsHygsPDzCF5I//rvh4WHwawB5CM/PCg0N - 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 - jmc2UjyTkUQ5wAXsaxys1SefpjOj2dwYJIxOQMZooYiIENmiE5AuOobLjkZCZgSDDQ1s - G7EPCBcWQQL/NJ0ZxQIDNWGz5sX5wyNM1mCeZkWBG5tKIUHPDoId8Uu7QWcNvO+ibaTa - Btc2cmyDZPu7ZhuxQGSNNODBPdt/45BPnOSXgNPooAH3e8DhBh0M4D4FOMH6FQyOEhBa - E05xwnROQkgU0JIT8d0jk5Ce/HA/Oeod4hFA6CAw/9an+7XpCBMehtTpRFkHrhLtKhGw - vxNAJHYPpnZHj37Xuv9kKv2bsP8nEAkkwgYPesb+Vx1+H73q5xz+GvwM3IGDO/AXP51G - agplbmRzdHJlYW0KZW5kb2JqCjkyIDAgb2JqCjMwMTIKZW5kb2JqCjg3IDAgb2JqCjw8 - IC9MZW5ndGggODggMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lk - dGggNzggL0hlaWdodCA0MzYgL0NvbG9yU3BhY2UKL0RldmljZUdyYXkgL0ludGVycG9s - YXRlIHRydWUgL0JpdHNQZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+ - PgpzdHJlYW0KeAHtnetbUukah200j8hJQBBQBAEBFVHUPGM65FnzkAeSsUgnDSW9Irky - HU2TIs3D6KhZqKU5UZYOk04zdc2/tp93YaWJ4579dT+/D3LQ6/Z538Vi+ZMPd0AA5v9n - B86cmH+1B0D57msCD+Xrs9/BD/0XUB8JCEFBZ09IUBB8m4BPA1IsHyg4JCTUl7CDHDwM - CQmGXwPIU3gHrLNngwEUFh4eERFBo9EivwQewFPh4WGhoYT4zzwCC4T1AQpAtEg6ncFk - so6EyWTQ6ZHADAegj3fCcikYzEVYkXQGi8WO4nC4XB4v+iA8HpfL4USxWSwGPZLwYD5Y - rn8cmYwMRlhMIPGi+YKYGKFIJD6ISCSMiRHwo3lAZFI8GI/g/BxcCgYbFkEDFqCAI46T - SOKlsi+RxkskcWJgAhB4tAiyff5xZ8iehYTBYKwoHj8GSFKZXKFMVKnUag1ErVapEpUK - uUwKxBg+L4oF44WFkGNxfDgYDWChEZEMFic6RiyRJihU6qRkrVan06VRgTtabXKSWqVI - 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 - w4mMJJr4o5L4Q4Cjd4nYHXjUgJS9Hsz14YcCD4nEnjLYny6wp44FAVJEcN4Hk4QchHoA - T4JpPigQ9gsWedIqvw55hpqQYgYS7OHAEz4OIZ2O+gyFn4WQ3/9tfN/5/HN4izvwr3bg - P/lGvMcKZW5kc3RyZWFtCmVuZG9iago4OCAwIG9iagozMTA3CmVuZG9iago5MyAwIG9i - ago8PCAvTGVuZ3RoIDk0IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2Ug - L1dpZHRoIDc4IC9IZWlnaHQgNDU0IC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5IC9JbnRl - cnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNv - ZGUgPj4Kc3RyZWFtCngB7Z39P5P7H8cThm12w27YsDt3GzNjzKbcNClMbnLXCY2pTMuU - duxLiSNE5KaEboYOOkiUk06dzuP8a9/359qOwlTnl+8v3/frB9nw7P35XNe1y8t+eB47 - hvn/2QG/I/Ov9gAox7/E/6t8efY4fNMPQD0kIAQEBB6RgAD4MgF/D0ixPCBaUFCwJyHe - eB8GBdHgvwHkd3heVmAgDUAhdDqDwWAymaF7gQfwFJ0eEhxMiN/mEZg/rA9QAGKGslhs - Doe7LxwOm8UKBSYdgB7eEculYDAXYYWy2FxuWDiPx+cLBEJvBAI+n8cLD+Ny2axQwoP5 - YLm+cWQyMhhhcYAkEEZEikTiqKhob6KixCJRZIRQAEQOxYPxCM7HwaVgsGEMJrAABZxo - iVQqkyv2IpdJpZJoYAIQeEwG2T7fOD+yZ0EhMBg3XBAhApJcERefkKhUqlRJEJVKqUxM - iI9TyIEoihCEc2G8kCByLA4PB6MBLJgRyubyhKJoqTw2XqlKVms0Wq02jQp8otGok1XK - +Fi5NFok5HHZoTBdYICPtcJocADoFEwskcclJqk12vSMTL3BCMnOJh8N+syMdK1GnZQY - J5eIKRwdDoWP4fxgtGA6k8XlRYglioSkFK1Ob8g+mZuXbzKZCiDwT35e7slsg16nTUlK - UEjEETwui0kPhuEOLtUzGgNgQrE0VqnW6rKyc/MLCs8WlZhLz1EpNZcUnS0syM/NztJp - 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 - L1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA3OCAvSGVpZ2h0IDEw - NCAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAvQml0c1Bl - ckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae2Z+VeS - aRvHW9xAZFEWBQllUR4REMVQ0MSRVNxSiwY1SEWdwdzyhNG4hJky8ebW6LiUZIzL0XK0 - 4U1PZ+r0r73XfYOlCdmc8/42fn8QQfx4Xff9PHh9v/e5c2f696zA+bD6R2sAlAtfdPGI - vrx6Ad70HdAACQgREZFhFBEBP0bg04CYFQBFRUfHBEQKKvg0OjoK/gwgT+EFWZGRUQAi - kcmxsbEUCiXus+AJvEQmk2JiEPHbPAS7CP0BCkCUOCqVRqczjolOp1GpccAkAzDAC9Mu - hkFdiBVHpTEY8QlMJovFZnOCYrNZLCYzIZ7BoFHjEA/qg3ZD41BlqDDEogOJzUlM4nJ5 - ycn8oJKTeVxuUiKHDUQ65kF5CBdiczEMFiyWAixAAYcvSElJFYo+S5iakiLgAxOAwKPE - ouULjTuP1iyaBIUxEtiJXCAJRZK0dClBZGTIQBkZBCFNT5OIhEDkJrITGFAeKRrtxcni - oDSAxcTG0RhMDpefIhSnERmZcqVSpVJlY8E3SqU8M4NIEwtT+FwOk0GLg+oiI0L0CqXB - BpAxjCcQSqQyuVKVk3tZk68F6XToa77mcm6OSimXSSVCAQ/jyLAVIYo7D6XFkClUBjOR - JxClyxQqtSZfV1ikLy4pKTGA4KFYX1Soy9eoVQpZukjAS2QyqBRyDBT3dauB0mIBxuGl - iAm5Sp2nKyo2lJYbK6uqa7CqqyqN5aWG4iJdnlolJ8QpqDpqbKjiEA36pANMICaUOZoC - fUlZRfW1+uumm+agbpqu11+rrigr0RdocpSEGDVLj4PiTrQKjUbFxFLj2VyBiFCotUUG - Y1XdDXOTxdrcarO1gWy21marpcl8o67KaCjSqhWESMBlx6PiTrR6/gJcHVBaIl+YLs/R - 6ksra00NlmZbh/1OV3dPL6inu+uOvcPWbGkw1VaW6rU58nQhPxGKg6vk64VDjcKqsbkp - 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 - erwQj4UPGg4PGODEAhUGsJB9fq4OnVfAGQMifjn6gCMKpODhB5x9wIIBK3xlhzhcHwAP - z2UOT2XQIz6ZgXMZfDCD6gpzVIH3Ab7AwRJ607Ejo6igPh8hoUOjAOpYDHLIOP4YJAao - R06z8LfoVSR40/Hf+vYzeHtYffs3z356tgJhV+B/9kNJyQplbmRzdHJlYW0KZW5kb2Jq - CjkwIDAgb2JqCjI1OTEKZW5kb2JqCjk2IDAgb2JqCjw8IC9MZW5ndGggOTcgMCBSIC9G - aWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ac1Zy25ktxHd8yu41CzEYfHNZTJJ - gBhJEGcEeDEwjEFbysiQPB5JNpCfzbfkFF+X99Gt8S4QhO5mVxXJuqdOHbK/yG/lF6nx - 52OQ0Vr5dCu/kz/Lt++eSZ6eJZW/55O81spL/p8M7+Tbf94+nW5/efn144N4ukcoshxM - Sxuk1QTzEL08Pcq3f3108k+fy3Q2F5McpXVReh+VDR6zFSsKMBO8qh7Ke0nBcygfulHc - xCIdpSFCMNtNUjERX2SbDuvg6Vw2Kg6jvIkDIw7jsu5hmsXbf90+fHy5/+323eeHz0/3 - j7cvT/cn3rIlw0uDA+kkyXEC75C0b/D/U03ju/dlv1q+f8fbKh+u+YXzjV3XECa3CAIR - 3iNRGjF0jWFkibH2tyGUmSPHuHbIogshSc4UPicVgrfkBH9+KAGnude+VqWUdc7N18A3 - moRHfdFV8NK9yibq7unCtIg6KYBkGEhaAkRnViD+eCPJwETLa7wue3HyBqD4CylkV97c - yQ/y6m9vgEIjrz6319MbhiYGPtY34uqhfXPfXl/+003+3mzk1c/tuzHw7zZw222f3ojv - 5c038s83eBT9cX6QDn/fY50/fuWjLc/IWeUFklU+GGRr9zxMDsoYGQKpGBwS9ig3ObE8 - c8mGUVqUbFz99428+amucMrs67FM2sVCZpGTmkkkrr55/tTfIeurLMurX/vIcDt9mlO2 - IxDrgU1UHkUZHSreAW+lVj7UfE47KJVR4ZVk8ipYr2nryCVyDlzOeaVdzEioUz5nz8E2 - CfV5SsKA19j72NbzyxorYknUaaDlh56NX/qbp/13J2C2ZrEFn0IN6xOmW4CnlfZGWyYL - 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 - ZGlhQm94ClswIDAgMTE1MiA3MzNdID4+CmVuZG9iago5OCAwIG9iago8PCAvUHJvY1Nl - dCBbIC9QREYgL1RleHQgL0ltYWdlQiAvSW1hZ2VDIC9JbWFnZUkgXSAvQ29sb3JTcGFj - ZSA8PCAvQ3MyIDEzIDAgUgovQ3MxIDggMCBSID4+IC9Gb250IDw8IC9GMi4wIDUwIDAg - UiAvRjEuMCAxNCAwIFIgPj4gL1hPYmplY3QgPDwgL0ltNCAzOCAwIFIKL0ltMTggMTAz - IDAgUiAvSW0xNyAxMDEgMCBSIC9JbTE2IDk5IDAgUiAvSW0xOSAxMDUgMCBSID4+ID4+ - CmVuZG9iagoxMDMgMCBvYmoKPDwgL0xlbmd0aCAxMDQgMCBSIC9UeXBlIC9YT2JqZWN0 - IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggNzggL0hlaWdodCAyMTQgL0ludGVycG9sYXRl - CnRydWUgL0NvbG9yU3BhY2UgMTUgMCBSIC9JbnRlbnQgL1BlcmNlcHR1YWwgL1NNYXNr - IDEwNyAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+ - PgpzdHJlYW0KeAHt0IEAAAAAw6D5U1/gCIVQYcCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYOAPDMOcAAEKZW5k - c3RyZWFtCmVuZG9iagoxMDQgMCBvYmoKMjQyCmVuZG9iagoxMDEgMCBvYmoKPDwgL0xl - bmd0aCAxMDIgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGgg - MjYwIC9IZWlnaHQgMTEwIC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAg - UiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayAxMDkgMCBSIC9CaXRzUGVyQ29tcG9u - ZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dAxAQAAAMKg9U9t - DQ+IQGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgIGvgQFPNwABCmVuZHN0cmVhbQplbmRvYmoKMTAyIDAg - b2JqCjM5OAplbmRvYmoKOTkgMCBvYmoKPDwgL0xlbmd0aCAxMDAgMCBSIC9UeXBlIC9Y - T2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggNzggL0hlaWdodCAxOTQgL0ludGVy - cG9sYXRlCnRydWUgL0NvbG9yU3BhY2UgMTUgMCBSIC9JbnRlbnQgL1BlcmNlcHR1YWwg - L1NNYXNrIDExMSAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURl - Y29kZSA+PgpzdHJlYW0KeAHt0IEAAAAAw6D5Ux/khVBhwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMPA4MsVQAAQplbmRzdHJlYW0KZW5kb2JqCjEw - MCAwIG9iagoyMjAKZW5kb2JqCjEwNSAwIG9iago8PCAvTGVuZ3RoIDEwNiAwIFIgL1R5 - cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA3OCAvSGVpZ2h0IDE1MCAv - SW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAxNSAwIFIgL0ludGVudCAvUGVyY2Vw - dHVhbCAvU01hc2sgMTEzIDAgUiAvQml0c1BlckNvbXBvbmVudAo4IC9GaWx0ZXIgL0Zs - YXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QMQEAAADCoPVP7WkJiEBhwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGPjAAIkcAAEKZW5kc3Ry - ZWFtCmVuZG9iagoxMDYgMCBvYmoKMTc3CmVuZG9iagoxMDkgMCBvYmoKPDwgL0xlbmd0 - aCAxMTAgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggMjYw - IC9IZWlnaHQgMTEwIC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5IC9JbnRlcnBvbGF0ZSB0 - cnVlIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3Ry - ZWFtCngB7Z3tU5JbF8Y1X3kRQREUQQx8A1IiKVRKIRxLxTLTxI4yGNaIB+PUyMSkpR6P - UZSKKePLMVNHbNTjaOOo41Rz/rVn7RseX0F8Pm6ffX3iQ82wr9Za+751Xb+iooiIA8QB - 4gBxgDhwHgeiL5jOc+aDPwNnv3SoGOx1eJZLcLSDY4b/EDg/nDs2Nu5CKTYWDoXsiGQD - 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 - ts/I8sQmnMh09UCm6+PYxNTs33hnuv6enZoY+wiZrp7Ima6j2b76Fksw2zfinfBN4Zzt - m/JNeEeC2T5LS/3Z2T6U8UwLZjyNKOMJAcd+lPEc9Y7jm/Ec946ijGc/xBtRxhNagcp4 - poXMeMYcz/o2mztsjh5XX/+fw+73GEd9Pe/dw3/297l6HLYOc3OErC/KvR9mvmtR5rvT - Dpnv1/hnvl9D5tveiTLftREy36ez/5aLlP23RM7+h2VAdHYBAwJjddu7Os/JgDjFAjFU - G+sbmx+3mi3tVqzVbjG3Pm5urDdWGyKyQAJMmFRgwgAQpVij1RmqaowUE6YZZyZMM8WE - MdZUGXRaTTHCoWTyU8MxYRAiKsgGkgbYQOV6A8UGMtZhLCPFBjLoywNsIOkZbKAoihFF - Q4woVAkHjKhynf42cJYw1m29rvwoIwrhkZi0UIwo8IBihTEpXFoWsMLkiBWmvqEpoWBh - CLqFp0pLNDfUiBUmB1ZYFgVMA0xWGFbYKWZcATDjipRXsYbGwZe/qiwCZlzBOZhxqBAo - cB60A8UOzDpgBwI8EF/JDtiBWUF2IAIohmYHggfQDQijGWRIZgiEoizEkMQcIilBDMks - kVCQEWRI0hFTNTRD8tAExBLlIJYoH7FEMYeJAkoUsUT5iCXKicQSjTrBlGVTTFkuMGWx - hsrC1wekLGLKAlw3IlM2YAKwhSmyboAtfCHgwoAWPmQLBwnLobG68DuX44xpGmJM4w+Z - DiCmGXTauRjThy4g1Hr8IWwcoNuYKggaB7R0Qvz5WOPo129ULcAVAdD1CwWdh+MEkPNh - 6NLo7EcEgH64KA+E+/89cHAQBNcOOweOnP/oR/Q3Lo6Onox8Jg4QB4gDxAHiwBkO/AdG - B9PlCmVuZHN0cmVhbQplbmRvYmoKMTEwIDAgb2JqCjI1NDkKZW5kb2JqCjExMyAwIG9i - ago8PCAvTGVuZ3RoIDExNCAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdl - IC9XaWR0aCA3OCAvSGVpZ2h0IDE1MCAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50 - ZXJwb2xhdGUgdHJ1ZSAvQml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVj - 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 - HLEkTyrLzy/AlJ8vk+ZJxDkiQQYEYZISUU4nFgfRlSA0aBUL1kB1ZCqK/KRC4idTIBSJ - snMCyhaJhIJMSP2kotAPFTJEEHHCIkRffpAJvIVDoZ9IqA4FdSBChNJIkEXip6WfKI3P - w/JDSRAgwhI/OIAFi/ygwaFeEQ6LN1HpDCYQ2cnJEHHyKyU5mc1OYjIZdKo/3ITBgqeb - /sYFolckMoS4IMLFYCRC/gopMZHBoNNpEOUikwLBK6jsAtjf1fljYZAwi4d8GZmcANGw - v5WQQIZIGMTMIGXmD4VdDMNwqFvEw6HMGgqtgeIDwh7EoQwcSsCdBODOL0HgyD9xOpSn - i8ZBog5F6k4ED3EAgjDYCev0G5AzZIwHBWKhwUhQ1CmhIyhN6M/5XRB9+xJ5kmhEWcaI - c0JHUQIRpei+WtcXTHimv0r/H57+iv3yiyeHfgxN4F9P4D/0JxiyCmVuZHN0cmVhbQpl - bmRvYmoKMTE0IDAgb2JqCjI5MzIKZW5kb2JqCjEwNyAwIG9iago8PCAvTGVuZ3RoIDEw - OCAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA3OCAvSGVp - Z2h0IDIxNCAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAv - Qml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4 - Ae2b+1NSWxTHNVHeL+WhPIIOKC+RTlKkaODAoKamWRQ9YCysCcOoJiYmH+GYMTJqUjo+ - psicsFFztGHMaarpX7vrHL09FK+3uWfuD/fu7w8KyHz8rrX3PpvF2SsvD+n/k4H8ffVb - OQDKoR8q+Ek/Xj0Eb/ob0G0SEGi0wn1Eo8GfCfBBQJK1DSqi0xnbYu5o5ymdXgT/BpAH - 8HZYhYVFAGKyWGw2m8PhcL8LnsBLLBaTwSCIf80jYAUQH6AAxOHyeHyBQPiLBAI+j8cF - JguA27x9wiVh4ItgcXl8obC4RCQSiyUS6Y4kErFYJCopFgr5PC7BA38Qbm4c4YwwRrAE - QJJIS8tkMrlCodyRQiGXycpKpRIgCkge2CNwOQaXhEHC2BxgAQo4SpVafQTTfBd2RK1W - KYEJQOBx2ET6cuPyiZzRmWBMWCIplQEJ05RX6PQGg9FoAhmNBoNeV1GuwYAoK5WUCMEe - k06MxV5zYA1gDDaXLxRJZUo1pq0wGCvNFguO48dIwQOLxVxpNFRoMbVSJhUJ+VxwV0jL - EStYgwFgkTC5CivXm8wWvPr4CVtNLchuJ37W2E4cr8YtZpO+HFPJSRwLhiKHuXywxmBx - eEJRqVyl0ZmqcKutxl7vcDa4XC43CH41OB319hqbFa8y6TQqealIyOOwGGBud6jb1tgA - k8rVWoMZt560Oxrcnqbmlta2M6TaWluamzzuBof9pBU3G7Rqwh2PncscQYM4BQBTaQ2W - alud09V4uq2985z3gm9HF7znOtvbTje6nHW2aotBSwQr4IK5PaFCoEUMNq9YIlNpDFXW - Woe7ufXsed8Vf6DrejDYDQoGr3cF/Fd858+2NrsdtdYqg0YlkxQT5vaEmn8IZgdYK1Vi - OnN1rdPT0uG95O8K3gzdDvfeiYDu9IZvh24Gu/yXvB0tHmdttVmHKUvBHMyS3YkjAoWs - SWTqchNuc3haO31Xr90IhSP3H0Qfxkg9jD64HwmHbly76uts9ThsuKlcLZMQmYNQf10O - JI1fIlVi+iprnRtggWCo91401jcwGB8iFR8c6ItF7/WGggHAueusVXpMKS3h56QVMTkC - UZlKa8JPOps7fIHunkg0NhAfHkmMJkmNJkaG4wOxaKSnO+DraHaexE1aVZlIwGEW7fFG - K2JyiUArzFa7q817NdhzN9oXf5JIjj+bfE5q8tl4MvEk3he92xO86m1z2a3mCiJULhOG - YVekNDqLVyxVYHqL7VTj2UvXbkWifUNPkxOpqenZ2TnQ7Oz0VGoi+XSoLxq5de3S2cZT - NoseU0iLeSx6DhqbB2nTGPGahtPn/TfCAEuMTU7NzL9Mv14AvU6/nJ+ZmhxLAC58w3/+ - dEMNbtRA4njsHDQYUlHZ4fLKagjU1xW6F3v8dCw1PfdqYfFtZgmUebu48GpuOjX29HHs - XqjLB6FWV5YfLhPBoO7xBhOELyLSdrze0345GI72Dycnp+fTbzLvlldWQSvL7zJv0vPT - k8nh/mg4eLndU3+cSJyIGNTdeQOaAGg6i83R1Om/GYnFExNTc+nFpZXVtfUN0Pra6srS - YnpuaiIRj0Vu+jubHDaLDmiCnDSOQCw7AoPgbD4XCN1/NJxMzbwC2NrGhyypDxtrgHs1 - k0oOP7ofCpxrdsIwHJGJBZxc3jhCsRwzHK1paPF29TzoHxl/Mb+QWV7byG5+3AJ93Mxu - rC1nFuZfjI/0P+jp8rY01Bw1YHKxcB+aRIEZ8FpX64Xr4ehgYmL65eK79+vZza1PpLY2 - s+vv3y2+nJ5IDEbD1y+0umpxA6aQ7E+DCQK0i8Heh/HRZzPpt8trHwD2+Qvo86etzQ9r - y2/TM89G4w97gxcJmlFzIK3NF7wTG0qmZl9nVtazHwH2FQS4j9n1lczr2VRyKHYnCFNk - PxpckBgcoURBestB+/btANov1/L8gkJYprAUTMfs7jO+7gh4ez63sLS6kd369OXrN9DX - L5+2shurSwtzz8FbpNt3xm0/ZoLFAAu1sADRUN7QDEFrAV1D0NUS7Qt5aD9FnxzQZ6Tt - 4g2tBbQW0FpAawFVlKh2/vnrPLQvoH0B7QtoX0D7AtoX0L6AvnVH9xfQnRR0Bwrda0N3 - FVFlhCojVBmhyghVRqgyQpURqoxQZYQqI1QZocroX6qMKD1ZmncA7fdOvf5Co+xELpWn - hSk9yUzpKWtqT4BTeTqdRunJeRqd0lP91HYcUNoNUUBppwbRk0JhFwmVHS7Udt9Q3RlE - bdcS0exFVUdVHqXdXkCjthONyi45whx1HXxAI2KlqrtwG0dV52MetV2Z2ziqOkbzSBzZ - gUpFNyuUvzvdsUTL7j/utCWqaZJ3iJouYLI6p7BDmeT9CQVuLv14D3r038/AH/MYydgK - ZW5kc3RyZWFtCmVuZG9iagoxMDggMCBvYmoKMTc4NQplbmRvYmoKMTExIDAgb2JqCjw8 - IC9MZW5ndGggMTEyIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dp - ZHRoIDc4IC9IZWlnaHQgMTk0IC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5IC9JbnRlcnBv - bGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUg - Pj4Kc3RyZWFtCngB7Zv9P5r7H8dtc1vpRjfITSlKKi2ayKgwVhgzWZubZZkjy/oOjY2F - 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 - j+IQGCxYfgEVh+IQgKPGMCGngYUrUgWQroB4BVI6JCsEqVi0ArIaTBTVIKAwROAawDmh - L96ChUgoNDozNg4FP5Ih+cFN8QvucpJR7CMulklHwQo/LHBsX3DhkVGQI6HQYhiQJMFS - KZBLwcQGQSIFEiSMGMi4kIhRMDOUwPnO8fr580t/+AZiKcCDwAyVFoMSMxCZ+Sx4QI+J - oUECBwI4USiQgsGC0kI+Z3kQzx/mIVMgzvNVFEjy+KI8GOtHMBgdzA7WAsJBWNDIlzSC - ZBFKG6GEERKkjD7HjFBhJyR5/OfmiOcDhoVDCupzDMoff4JwESSgvkagfshCREhxIeBp - LKEVJKIV+iWdBajgE/u8EP6f8DQfEuMGu0HPOPaiX3qIXvdVv/QS/En4BE6cwH8BOI2V - VgplbmRzdHJlYW0KZW5kb2JqCjExMiAwIG9iagoyOTQ5CmVuZG9iagoxMTYgMCBvYmoK - PDwgL0xlbmd0aCAxMTcgMCBSIC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4 - AaVXyW4bRxC991f0kTyo1ftyjJUEiJEEcUTAB8EIBJqKZZCSTdEB8rP5lrzqZaY5Q0oK - AoLiqFlbV716VfzK3/GvXOLlgufBGL7f8Pf8gV9ePSm+fuIqv57W/EIKx+ndCd7xy982 - +/Xmy+Hb7Zbt72FKGTImufFcK+6j4esdv/xpZ/n3j9lXJ6CiPyVhUrYQNff4XikhEytG - QjNSRciW1oGCkvhrXXWWitzl75vt7eH+r83V4/Zxf7/bHPb3awrTwHSKXEm8Ld34Drd8 - i/fncu+r6xyB5NdXdKX8zwV9UIIQCvRxuaLOoH6Nm0kYkMWA5tnAsTLuGmQO8MIG4b2X - mjtEvuMXKT9sGZnp3HUaTnjltLFNQ8FASrpY2Gb/M0XKmRJB2WibnvWd46KGOmuqs+So - 8cwGXfbNiimN7yW/wOcYvOUrVPZHlAcZWt3xG774dUkw0XzxuARU8Pmxfm7aF98tWZH4 - Ur9pn9v6/339XDeN2/ZwaF814w9L9oGv3vIfVshbq98Nt3h9QLQfX1dLZNmgDmzH8aSl - 4kNejvGvUpiB5qb46dKWIZIzD/EBIwSx12BEO9WDxFjvI6sgiSidM7piZVryXtOIGJNM - RXLHNTSDjugR3HKGlU4RaUg6yKYHsOQACjizwx4srLt1Z+TNik/QUoycQMvPtdSPS5bB - Mi/5FBSHvxsYfhlg8VCt1AO2+LMeDJjbL4GH/4UTKijdkYCChqXHZ5ASABTtQUfgIxW4 - S8RMNmSeYWcgQ40GPeQ8KSnNVG/CDAPKkgULKWFdDks7oYIiXtPCeB0rlBszdQUbmEwb - UIKUipGOtVDG9U7YyWc2AxoKoBSSq7rZX9bN6GI9SnpKUUELZUHpFmnMTDgBC/itwkRX - UmGLf5Z89bm0eBf/i6Zw+akp8BOwUtgHVFIenj61J6CxHA3I+tZOBrU1pAlKLFPObERq - E2kUaZ1HEUpPE+JounRXaCVgRSvnH1kZtajm51JptBKJBqSRQoYApprxtFeIZZID4mgQ - brnnfmiQP9rRup2xxZCFw7SdRmkQcTE1JGh4GGyvD7W7h5T3WmNf4h5OS0NDVp0bu9oH - EZLFOMLQiS4Bg8aju7xDG+AMbzOh7yOzmHAmSpHQNbRWxGA9aL+YQM8qL5THrNzWI0jR - VpHI5qeZJpzfIdgy9Kd1JcJorkpkCHF0peAqGuc7VwpNZ2U4ctU0EeQpAqCia+coJfn6 - MgI8OCpZqkfI0rYeaRJD6yFzsDjTbGIIi+IjMag+j0L0qQHBOYHS0Z0nDW1RnFMYHHDG - z+KMLf4zzsrKcQpnJ/YEAE1IbVwwAVU8XtVaa+a8Rau5QpaTw8a4Y4QWr8BU+SyhrEOO - 6r7Q282IA1hhw4UgpESFCwy8som5qIROSGGBHECJ4QuWBIlT7gl0M+WXQFcUSnSA7ugN - EWMdlNhLOm/KY/RGRVvP6K0pv4C7MTOu4W48QrIKoKKVSBbcWCSw4m4Ug2YTwy8GipDE - cPY87pyIkHI2Yma5E8Dzs0lyRH0DBT01dqtgY4tXQJO/Bpps0VPgeWieWE2wauMnj0wa - OwNxYb9pTaCJhkfnCQWcDJUGoDUNc9P3b8amxJ41Gu6xiTHiLXbLSlFUH2esiHZEi8VP - H4e1RgcM/y0b0eJG5fPYJK5qYKbo0HgtYgdvTKUolBs7gbxp6UXQilhy9NYpn+FERswW - LVqJUqM1FtpCijjr0lVhFzSd4QeZyavPVBULM/FpVBLoRIwQ0xWd7/4FpPMjwAplbmRz - dHJlYW0KZW5kb2JqCjExNyAwIG9iagoxMzIyCmVuZG9iagoxMTUgMCBvYmoKPDwgL1R5 - cGUgL1BhZ2UgL1BhcmVudCA0IDAgUiAvUmVzb3VyY2VzIDExOCAwIFIgL0NvbnRlbnRz - IDExNiAwIFIgL01lZGlhQm94ClswIDAgMTE1MiA3MzNdID4+CmVuZG9iagoxMTggMCBv - YmoKPDwgL1Byb2NTZXQgWyAvUERGIC9UZXh0IC9JbWFnZUIgL0ltYWdlQyAvSW1hZ2VJ - IF0gL0NvbG9yU3BhY2UgPDwgL0NzMiAxMyAwIFIKL0NzMSA4IDAgUiA+PiAvRm9udCA8 - PCAvRjIuMCA1MCAwIFIgL0YxLjAgMTQgMCBSID4+IC9YT2JqZWN0IDw8IC9JbTcgNDQg - MCBSCi9JbTkgNDggMCBSIC9JbTQgMzggMCBSID4+ID4+CmVuZG9iagoxMjAgMCBvYmoK - PDwgL0xlbmd0aCAxMjEgMCBSIC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4 - AdVayY4duRG811fUUTroqYq1vqvlBR4MBjNWA3MwfJDbLVhGt2W1ZAP+e0dELuTbpDHg - iyE0ilHcMoORWSSfPvU/9Z/6Af+Wbe23aeqfH/qf+7/3r998Hvv7z/2of5/v+1fDYen5 - 1zR837/+8eH5/uEfX/757rF7/oChyjJpuDLt/VhKP09zf//Uv/79Uxn6X3/UdGM5qs24 - r2iz9vM+RJtRbbpPeF/blHm4bIO5xnHXOFvpx6n0C4bzqUpOddakjN1XmpQZ7n19FDUp - oMZ8Kp37hJ5kcYZH83jYMM5cotEU1jSNjvOhnDa6OdI6FNDuE94e67TZ5WhlWWjXabNL - y6Zhp2Wnza6PdubAtbG2cypspNd/eHh89+XDvx7efHz8+Pzh6eHL84f7HgIaDtu0LWWD - 6lDc13kde4hvhJrWdemf+mk5qvTYTyt4Xse5Y8W0znhd9MIBNKXSvMw9W8/9vIwH6HIF - sK79PB81Ip+apWPpEfMt1pJwRFRkVwPQtL+eL55Ws65Dx3GmalYOSoPDo/v+r1l+6t/D - 7+/w9zeLvzdvJaqhe/uGchd4xQcDFYLQIHuwsstN92zd5fI20A9wRv83dOpYKBudVGn3 - 9klJ2WdRwqcRz1JDCSH9Kt61E8CI5jjHjjfxtBpMb4ykUZURJItp72B08kG33iJdIBEh - kD7DaeigIaHMM6KC+gARv7pDwnB6Sv9qng7DsO1jP3d3iNPfjocB7N297//Yv/jdSyir - 9C8e/fnRn3/257uXTHVNg94rvn/Z6X10uI+GFz0+eI8v/37Z/6m/+67/zZ054hl1OOzD - uCwbxtv2IzQsiSNfrFiop75MkDhKj31hKoHEBeEwnqu9MMAVYmkZKDaW5uNmws2u83HR - iHxiHTALS1yIo0sccJy27Ir13Dii1tNK8SaeXM8NxpguWHKzclDaj7k6PrWk6d37dhGr - klG/ze48Co3vQPCs21ZXMt2U2lgoEKJ5XhCy4io95yeIXPJpnrP0CP/cc0I6kl0NIEr8 - 9XTxtBqFDxpXo3JMWEuO8Qi3UTQll2XVQjKJIS1ohScmZSUxwGlBlgsqDXAYlrgeiFiU - coWjq9aTI9oKY5bOVhif4rrCZUE0pDgAbIX5mqXzJ3SFGqwwdaVSCC8Gpf3hEV2NMpNY - E6a5wrRLVNBUFOiNrxgQPcsVFqBuWLAVtpK3j44dF5DD2QrTAq0wbHHPCWl+rrABrnCU - /NkFthqtMF+lUTkmrOVMeITbKJ7kqu48V41HbZwG7QjOchXEOE1H5NS5v8hVP7zsLBdF - zvmLZ5aHyD01OVlWi4bXkpOlr+vJqVmxaWBiXb5h7GVi/SFsCht+obHdi2vGmjvXjY29 - KfLoOO8jt6X7vpZh7jyTMoxGJROmzJEZYnL9EirBzrunC2ZbbNuw7iwNq1ofu3VIDUXX - gV0xIp7MJ5gFJWTS2TcLhOOM0I6uBtaOrfmam8PTp9dgfo6DujCrDgqDNRee9x02C5wX - 5Vtxxvq9uPMoNL4D0ccdW0/uCRA+AJt7PmLTxbbI2+UY1GRaZ09+9qFgWcBS9RwpFVtw - mJ9dDXDsKJ0/rQbTm+NpVDoOa90Xy6TuFvcEfM99Or+V+Pqh1HhJSDeWfbLUaoBrptJs - ekCDCTtdbgdTHMtEgBHxND9ZavwkpCPZVQAjmjcLSvEmnl6DzYg5mmalozQ4PApXzbvr - mZRtx3lz71Fijg59s0KLOOdHDiu6cN30+miKwDucQOx7mV2PGySBVT7aumEWlKr3gnQr - uxowTfC1i8CeHbF5z/nN+zHMSu9pcHgU3pt3XOmCzRHU3uGbiXYWyxPG8F3RiPSPbVME - jQGunUqKZSt5LEdXRDe6ckTFsmZRLJfFNcEKfdIilg0oT/A7jrH9Db4chvnlQEmxbKVI - MTkok495BBvxzfTytVjmOZX1imWaqlgOB4joWYSNAa4b31osW8m46rIjQ5XDWSxzBovl - 9JyQ5mcsG1Ce0GuoxJ7eLGoUy6xKo3JMWOu+hNty621nK2xqp1UsYWcQK0xINyJoHDDe - 9FqxrJLHcvWToaoRFcuc3WI5bSKktRnLAoplL8lPxvRZjWJZ7zzFoIHLhgZrLjzDVbyD - fq/HsviH36Zv6r7xnlCLGEED0Fks67Vi2Uoey0kcI1errFjWLIrlNBQNbBkzDXBNFbH0 - jKXzp+nbYll1YVYM2tHg8Ci8r7F86yQ3HhHjA/bol+e47bDuR9yaXDnH/fh8vt/IbUTu - jj5Hkyz0foj73jdSsVfJvr/wMPepnsZp/jJPjNezrd2c5l9u7b5qvu/60uos/DfbvdhB - 2bbv9CzamG/bvW/xnw5gi2Xn6K864EfotDsLpw50L/4H/Pt+9f9sBWIPy3uu43Zcd1yb - HtYRn7JdtwGL3Zwh1eCaBxcmvFHcR14pbdNhGXEnAAiAIxFqNv/SJNb+xStxLaYDv8MF - XwTsero6EObCFYBPIoDPthsgiFmX+XDEJrvHtQUbL7hqw7w5lmNNxc5WLXgb1Ia4e+Yc - 7NVVZ3JOeur2oFiNO31/0gQbZfXoSNOt7Os9MHFlmaBhmdBYRebVxhnJ0ZhEb9riAPQ1 - LJNcZEJspmK52C5YBvcE6YjBhmVvbDTWsQJzqiAPYxEaeZjuAkRDEpIsA4QzwTJGgIuS - HZ2uxpGB+r4pMsU30G85RtySYRVFeymgQcrFzKWshyGUW4qumXOxE2uH5ZXUDze3Dl1t - zUAwC7dbPokAPlIywIWKzsN2QFC5crsy4LBWlYtqw67cE3gbYBb1g1h19vBBIgzrnGAh - 7EGxGnf63pqIM3023QNReGPfYE24UNgmGgEElWVtFJy5XOzE2rMZrSaZZDnVlsslMXYx - iSvXvQrlpsf2wpmrYxlBmgqn4aymWG+D2lDKjYah3JjTPK2EJMskJOw8LTYsG4U6VUrk - 3YpLV/7SQGP5e4lgkxHsBf1kLe8SLc4dr+iM2FF1txbdeXvbgsjgeTNzwopfp2IaFDPk - +L7JBoD0UfPlGIF1W1lBtsN5rL7NHLDisMeQiro0P7KAe2fxbqCaJSo84lUXCSMaZj6w - F9/Iu8eW6E6o4VnYaT7iKK+fMQK3LON3QF6OetU4gijeqCbLI26InGUW0x2ChmU1M8pi - DKep4wRJIYHTd1bMJkealyRX451kc9V5lJtpkzlt7F+Um3yrOiRcHqBM+cG4x6nBmg5c - x54AUraJKQsEjqUEk20Cl20mBMozppFswwTJNsNSzSzwcTnnVy2BdQVbgcc2J26KkQA6 - yRaMRl3INuYK71oqMg0YFWajR3cYLEE3ySBI/GrSNe4jIQo1PAs7dbnygU22jky2BiAx - ky2I9a8k9RhJV7J1o0226bmaeXoN6UemlGwbcL0YLPcuW28VxuOT6V9Qc804Vjkpvqhx - W70VbjrUy4Tv+4QNv21FesU3DJcGCUHnji879wq+eDs2rU22LcIuC1jh1cq2CUJyORRl - 69OYbN0EpFfMuO62w5VsV9x8Yr6UbWDJtoJyrcg48vfMtpRtQP9Y1LkkwNJSgc4N7Fpw - UoOEBFqbpjd3udYouHcGtDINz7aCxmOsfPAqXSTLkC3psqZVtsGy9Ggss5juuGyDZTUT - LY30jSbGRVJI4PSdFbNJyNZGq8bHVOaaMeWCdN4uatr3vGxvscl2KvqPG5Eopgm/t4aK - eXUz2BbX6qe5qNbTFS6nHFseCCjZJnDZ1qGg1ZhGsjUTOuoUM5bRtreE0wiBNbJNTNk2 - 4KKojUpt4rKNZpFt61yS7QkV6CxmPMGe1J0Ayvbkxa1Ngo+nNcL1mBEt1PAs7NTlygc+ - Ydlk61Up22SZevQ5TLZuo8k2PVczsVxl6zSZbBtwvZgsu2ytVVeNjwU110xuKgfF/UWN - 22qtINsW12zrBzHLtQ4sA9RTGaKaNX6Q6RjlwjqVOdBRyTIA6/JUhgxgA+kgxjyjah7R - 7pXHEqIzgrOeyhThJ2MhlonjVNbAjtkg606AZQTW2anMG+apLOfk6Qv5wI+plqLYLd+f - FyPXeqNrktV9vQbl7pCnMiOAoGGZ0FmtpzIjFhtC5j0BP9Uny/UkFSxzu4sNgk8ikI5Y - XWXZ7xucrDqWEaRTmWdcOGgw2+qI1jT0rxsb2qnM6/JUFizL00pINY4MGPsXTSzjamxS - yFPZhMMtPsV2nzDxtyoDSALIS3EThtSq7UQoF5nYMZUbwJUbMJRbB6Jyu5hEMmbQmQGC - TLi4sMv7BGRVXL3BohzLMacCVVGtmW+D2lDKjYah3JhTNwRhD8RajQNo3jdFS7cNhZdb - WyrXe3BBmGvFMkHDMqEzl8pNTOUaSOVGXdyEJcumzpjElRsGCFaWXblOSCo3MdWZ5Jly - T+paUJfDlBt1odxgWfEb9sDpZFkMSA26cjhpwqQrlo1CKven/wCNSYf9CmVuZHN0cmVh - bQplbmRvYmoKMTIxIDAgb2JqCjMzMDcKZW5kb2JqCjExOSAwIG9iago8PCAvVHlwZSAv - UGFnZSAvUGFyZW50IDQgMCBSIC9SZXNvdXJjZXMgMTIyIDAgUiAvQ29udGVudHMgMTIw - IDAgUiAvTWVkaWFCb3gKWzAgMCAxMTUyIDczM10gPj4KZW5kb2JqCjEyMiAwIG9iago8 - PCAvUHJvY1NldCBbIC9QREYgL1RleHQgL0ltYWdlQiAvSW1hZ2VDIC9JbWFnZUkgXSAv - Q29sb3JTcGFjZSA8PCAvQ3MyIDEzIDAgUgovQ3MxIDggMCBSID4+IC9Gb250IDw8IC9G - MS4wIDE0IDAgUiA+PiAvWE9iamVjdCA8PCAvSW0yMSAxMjUgMCBSIC9JbTIzIDEyOSAw - IFIKL0ltMjIgMTI3IDAgUiAvSW0yMCAxMjMgMCBSID4+ID4+CmVuZG9iagoxMjUgMCBv - YmoKPDwgL0xlbmd0aCAxMjYgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFn - ZSAvV2lkdGggMjU4IC9IZWlnaHQgMzcyIC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNw - YWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayAxMzEgMCBSIC9CaXRz - UGVyQ29tcG9uZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dCB - AAAAAMOg+VMf5IVQYcCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMDA+8AAZPQAAQpl - bmRzdHJlYW0KZW5kb2JqCjEyNiAwIG9iagoxMjc4CmVuZG9iagoxMjkgMCBvYmoKPDwg - L0xlbmd0aCAxMzAgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lk - dGggOTAgL0hlaWdodCA5MiAvSW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAxNSAw - IFIgL0ludGVudCAvUGVyY2VwdHVhbCAvU01hc2sgMTMzIDAgUiAvQml0c1BlckNvbXBv - bmVudAo4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QMQEAAADCoPVP - bQlPiEBhwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGPgMDGEIAAEKZW5kc3RyZWFtCmVuZG9iagoxMzAgMCBvYmoKMTMyCmVu - ZG9iagoxMjcgMCBvYmoKPDwgL0xlbmd0aCAxMjggMCBSIC9UeXBlIC9YT2JqZWN0IC9T - dWJ0eXBlIC9JbWFnZSAvV2lkdGggMjM2IC9IZWlnaHQgMTQ0IC9JbnRlcnBvbGF0ZQp0 - cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayAx - MzUgMCBSIC9CaXRzUGVyQ29tcG9uZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4K - c3RyZWFtCngB7dCBAAAAAMOg+VNf4QCFUGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAwDswjk8AAQplbmRzdHJlYW0KZW5kb2JqCjEyOCAwIG9iago0NjgKZW5k - b2JqCjEyMyAwIG9iago8PCAvTGVuZ3RoIDEyNCAwIFIgL1R5cGUgL1hPYmplY3QgL1N1 - YnR5cGUgL0ltYWdlIC9XaWR0aCA1MDYgL0hlaWdodCA0NzYgL0ludGVycG9sYXRlCnRy - dWUgL0NvbG9yU3BhY2UgMTUgMCBSIC9JbnRlbnQgL1BlcmNlcHR1YWwgL1NNYXNrIDEz - NyAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+Pgpz - dHJlYW0KeAHt0AENAAAAwqD3T20ON4hAYcCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBj4GBgHLQABCmVuZHN0cmVhbQplbmRvYmoKMTI0IDAgb2JqCjMxNzQK - ZW5kb2JqCjEzNyAwIG9iago8PCAvTGVuZ3RoIDEzOCAwIFIgL1R5cGUgL1hPYmplY3Qg - L1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA1MDYgL0hlaWdodCA0NzYgL0NvbG9yU3BhY2UK - L0RldmljZUdyYXkgL0ludGVycG9sYXRlIHRydWUgL0JpdHNQZXJDb21wb25lbnQgOCAv - RmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt2vlTk+fXBnAXdkIIISHsBiLE - sBiiaFCURqNVllShBRkXlKUyIogLAg4WkDIiWERQRhg0CgMMwiBWW5dq5/3X3vMEtApY - e6bfH3hOr/uHDp05MlzXh/t+7pCsW4eFBtAAGkADaAANoAE0gAbQwH+jgfVYKmzgX/xu - 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 - wVJNA8nJSWZzYkJ8bIwpyqBXNnwwPeNpx3/hrPft+kV62vZkr4uINBhNpujY2Ni4+Pj4 - BCxVNEBUcUQWbTIZDZEROnKnDf81eN+uX9z2ZK/REn6EPtJgMBqjokxYKmkgKspoNBgi - 9RHErtWQ+9KG/5sdv/SsV+j9AwKDgkNCQzVhWm24jn4BsNTUgE4XrtWGaUJDQ4KV/b54 - 0n/pGa+w+xbd8zZsXMIPClb46RdAownDUkkDhKWYhQQHBy2xK0/4r7or+Ir9Ir5/QEBg - YNDSCsZSQQMftAIDA2iz024n9n/ovmiv4JP+Rj86+bHU2IAfoSvqxP6P9rvvwPf9h/6B - j1/5x75fAvpGWGpoYFFM+a9i+Jco+yvln2OprQE2M/4BGkADaAANoAE0gAbQABpAAypt - 4P8Bht2XOAplbmRzdHJlYW0KZW5kb2JqCjEzOCAwIG9iago2NTA1CmVuZG9iagoxMzEg - MCBvYmoKPDwgL0xlbmd0aCAxMzIgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9J - bWFnZSAvV2lkdGggMjU4IC9IZWlnaHQgMzcyIC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5 - IC9JbnRlcnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxh - dGVEZWNvZGUgPj4Kc3RyZWFtCngB7dj9U1J5FwDwXhR5F5AXETCQkPAlxEzwJZfC1kTZ - wl2M0aIUNyfCl8yUxlbNZSJtldSccCxMBx3DMdvc1dxqnn/tOd+rtopWz87+0p3nnB8a - tPHOOR/OOd9776FDGCiAAiiAAijwNYHDtI6vVfeF/yd1H/kUR2kYn5I/Qmr5QqkH/Nd2 - 8VB1UlIyzSMpCcogGP9AgfruoXgoncFISWFuB4tWsZN1SgqDAYUAA4VwwNe971ekfqp8 - BtTOYrE5EFwul0e7gKRJ7mwWi8lMAQUK4evTQNUP3z6UT4rn8vj8VIFASNMQCFL5fB5A - sFnbCGQY9n3pu39Bdh+0P4PJZHO4fD6ULkoTiyUSqVRGu5BKJRKxOE0kFAr4fC6HzWQy - oA/ILOyuOOEzGQCoPwXq50H5aWKJTJaekZGhUCqVKpoFpKyA1NNlMok4DRB4YADDQAw+ - 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 - EMArkoTXZCiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiAAiiA - AiiAAiiAAiiAAigAAkyeUKbS5hSW2hxub3vgwcjE9MuF5Tdr65sfPn78Dy3j48cPm+tr - b5YXXk5PjDwItHvdDltpYY5WJRPymMlHDx/aFYePJDO5QqlSm2P6JDAemV2Ir4LA+w90 - FfjwHgRW4wuzkfFPAqYcrVIq5DKTj6DAHoFD/489sGsG4ONXBGg5BrAGvjgFKPDPBGjY - BB//RQ9c9rb1PhjZfRbA1eh2HkLKe6egt817GU7Dv8+CA3sgywCnYS0RGBx+EonGdk5D - cjl6EZCMdwRi0ciT4UEiUAsChqzt03C/gECiAIGSc7X1zf6egUeUwOu31P0AdT0aGWzl - Swm8fR0nAo8GevzN9bXnSkBAIRGQ+4F9AhwQ0BgKSs7WuJr8d/tD4WfR2CsQePcX3BR+ - im+/Ez6lCj3w17v1t69fxaLPwqH+u/4mV83ZkgKDBgQ4BwuIM9QnjGar/afrvu5fHo5N - PZ9fWnnzxwbcFELsujAtPpKc329u/PFmZWn++dTYw1+6fdd/slvNxhPqDPFBAklMTioI - 6I3m76rrPDe7+oK/Tc7MLS7DbfG7zffvKQRyUfoEJL35Dm6KlxfnZiZ/C/Z13fTUVX9n - NupBIJXDTEqcgqQUDl8sP5adf7qiynnlRue9ITgMojFogrX1jU2axgY8F60swRoYHxm6 - 13njirOq4nR+9jG5mM9JOUCAzU9Lz9TlFZWfv9jgbesZCI1NzcwtxIHgz3USG7QKKuU/ - ASC+MDczNRYa6GnzNlw8X16Up8tMT+OzDxBgsPmi7cfj2stNvjv3g48nIi/mF+Mrq7+/ - XaNlvP19dSW+OP8iMvE4eP+Or4kchtTDsYjPZuzrgaMMFg8ej7MMBRZYhZ7WjsBgaHRy - Ojq/uLS88np1dfUNzQJSfr2yvLQ4H52eHA0NBjpaPbAILQXU7QCPxTiauAfgFQlXKIFV - eLIYFkGD19/dNzQcfjr9Yi62uPQqHo8v0ywg5VdLi7G5F9NPw8NDfd1+bwOsgeKTsAgl - 5PVAogB5SQSHgfyYLu9Umc1Rf621o6c/OBKejMxE5+ZjsYWFhUVaBSQci83PRWcik+GR - YH9PR+u1eoet7FSeDhYhHAUJr4gOHSIviTj8NFgEhgKztbqusdl3O9AfHB6dmIrMPI9G - Z2dnX9IqIOFo9PlMZGpidDjYH7jta26sq7aaCwzwjiyNT26I9r4gAYGkFDYsAoU6Ox9O - A4frasutrkD/r6HH4fGnU88ikcg0zQJSfjb1dDz8OPRrf6DrVstVlwNOgvxstUIq5JGj - YL8Ag8kViOWZx3NMFuuFS27Pz7du9/YNBkMjo2PhJ+PjEzSL8fEn4bHRkVBwsK/39q2f - Pe5LF6wWU87xTLkYngrgKEgQOHSELAI4D5UafX5Rmc3udHtafB3dgfsDQ8GHoUfDI7SL - 4Uehh8GhgfuB7g5fi8fttNvKivL1GqVMRIYgcRFSi4CMATSB1mAsPlNZ43RfbW71d97p - vdfXPzD4gIYxONDfd6/3Tqe/tfmq21lTeabYaNBCC5Ah2LcGiEASg2oChVqXazJXVNov - uRqveVt9bZ1d3Xd7egO0i96eu91dnW2+Vu+1Rtcle2WF2ZSrUyuoFjhgCEDgaDI0gUAM - c5CdZzKfsV1w1NU3eppabtz0+f1t7e0dtIr29ja/33fzRkuTp7G+znHBdsZsysuGGRAL - SAsc3bcG4G3xVhPAHKiy9EBQZj1f7XC63A1XPNebmr0QLTQKkm9z03XPlQa3y+moPm8t - AwB9lgpmALYAtEDCHSF5W0I1AYvLF0mAIDvXWGQpt9qq7I6Lzh9drvrLbtrF5XqX60fn - RYe9ymYttxQZc7MBQCLic1kHtwAIkCZg81JFUrlKozPkm4osZRVnbd9XVdtramsdjh9o - FQ5HbW2Nvbrqe9vZijJLkSnfoNOo5FJRKo9NtUDiWbjTBLAMgQC6QK3V55w0nSq2lJZX - WK3nbCQqaRRUwues1oryUkvxKdPJHL1WTToglQczcOAWoMbgSFJyyhZBuiJTc1xvyDMW - FBadNpstJaU7UfbNx06mpSUWs/l0UWGBMc+gP67JVKRvAaQkwxY4qAWoTbBFwBeKZXJl - plqr0xty8/KNxgKTyVRIs4CUC4zG/Lxcg16nVWcq5TJYgtABAHDQQUCm4NBhWIaEgM3l - C0RgoFAdU2u1umz9CYPBkEMilyZBJQtJn9Bn67Ra9TGVAuoXCfhc9jbAwS1AmoAQMJgs - Do8vFImlMnmGUpWpVmuysrQ0jKwsjVqdqVJmyGVSsYg0AAt2AHTAZ2aA6oItAmgDMBAI - 08QSmSw9IyNDoVQqVTQLSFkBqafLZBJxmlAA9UMDfA2A6oKtNgADLh8QhKI0sVgikUpl - tAupVCIRi9NEQiifz4X6txvgCx2wvQsIQTIjhcliczhcHp+fKgAIeoZAkMrn87gcDptF - vv+tCfjcDiDlUwH78MjRbQQmizAABJfLo11A0iR3NovF3C6fbICv1k8QiMEWQjKDkZLC - 3A4WrWIn65QUBnz58O1D+f9j/VsGBAEUjibBRNA7kqB4Uj2U/z99/9QgUP/AH1AM5I8p - DLgQvWIrc/IvqeXvyv7xJ/Ln9I1/XC7+AQqgAAqgwP+hwH8BzjDJ8wplbmRzdHJlYW0K - ZW5kb2JqCjEzMiAwIG9iago0NDU4CmVuZG9iagoxMzUgMCBvYmoKPDwgL0xlbmd0aCAx - MzYgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggMjM2IC9I - ZWlnaHQgMTQ0IC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5IC9JbnRlcnBvbGF0ZSB0cnVl - IC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFt - 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 - IMswQ8n52vpmX0//k2cQcxzIYDlJ/PRpy/fmBpDjEPSzJ/09vub62vMlBkwGZGjodM90 - vJ0NqOk8bb0DQzgZYt4if8KFsyEOCBonDw30tnlQ2wEZGnpfslwNZDsiP4TWmJmP/01O - gBO2k+T5GWiOh4hsB7Ja/s9kl6fdv5u8BcbRO8j+do/rP5D/BiP0/4K83TKYPoBn+H2F - kyhXmKhges4HIu88QR8mOe0Y/Jznj9tN/08q+HGbaTgKD1DBjB05E3EMwhmJiPMGYec6 - 4s7PRP2mZBL2O5hJJuy3m7jrDcKukYi7riPsWvQIYdfP6NRP0DU/gfcpcKNJyL1VBmH3 - gxnE3cMSed8N4w1CZgUZhM03IGiiZjLEzZFw04TMvoBM1LwOmU6MAg97xgiTfaLmoigP - fPh86LNceB5B1PwZRydsH/bMHD1FwW0f/pwfLtdxNsSN4If5bALdCSB24sHH4T5PSbAR - HOiH/AwIsZFz3DvaAwh2klLiE/SKtkls/UWv6Ovp+iLU1y99TYDgBP4CtzlsJwplbmRz - dHJlYW0KZW5kb2JqCjEzNCAwIG9iagoyMDY4CmVuZG9iagoxNDEgMCBvYmoKPDwgL0xl - bmd0aCAxNDIgMCBSIC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4AcVYTW/b - RhC976+Yo30wvV/kco+tmwI10CKpDeQQ5GAocutCjhPJKdp/3zezH/wQJaswisIQJNIz - s7Pz3s488iu9o6+k8deGjoJztF3Te/pMl1c7Q6sdGfnbrehCNy3xZ2R4T5dv19vV+svz - t7uN2j4glPFWwrmOXEtdcLR6pMufHq2nH55kMeN4OU2wMKEfm7TZRI1MbOyWTMhFCWKM - pb7jrLqYV+rKQtmk1WStg0nnjMrJLNg4bzhM35eEq814S31jW/I2NG0Jtbiv3lS7Eq5s - jiabi9WuxKt2Of3OUB+b0JILHgnmDYSlTfaw4SoorndNfyiD8y0iuL5GyTaXv643d88P - f66vnjZP24fH9fP2YUWA06P2KIixGrgqMOMebLjG54/Ej6sbAUHTzRVDLxcX/MVEQqbw - dyCQuDOxbkAATddKpwCWJMDU2WgsGiXFi9Y1znddT5z3IznfdMEifb7ccDQ1WnXkCCij - DTpmv9aOwogfp2+Z3ppA7f0gDMb3t8g8b8nSkIunWzD6R9OgKHR7Tx/o7M1f53w+LJ2t - y49V+fHtXMl/nh/OcXxg8pS/P+fvn++KablTb/yWTWrU7bn6SLfX9OYWlSxQfCCPv49I - 9dNpsHClmArqkfinNSZVc//Qmz4yA5oYrIUtqOAabUMvbQJbT4uO6ifQc/XYk7Gf+WQG - IFeh0CIDrHfMgMb3nRzYCxeBu8OiiQbWDAQYYzf2Y/ZZPqwejUfclOtHUY6zYB5pRoWa - j1d7VPilgFlg/jTH8CDe6mwBb+D6KrwZC96O9xm4dGm6fIL2MXc6LGOeGsABzLng7Hka - 5ugA01Pv0OYK5hzqVMzHfrLVCebodSdjPo90EPP9438Ec5XawkHM6XTM1b8647ydEeZ8 - WTFXe8M9YqBh9nlMZIqaW/XBw83oJPOYrJkWfKwt2jOGLHo+gtg+BZm3BjmXYtiKe7Jj - d4cuDXftknsi25J7MjQaDamsw/5Lpsb0GEVoc9ZwCzEeV7nVJQ2C5m+dacC9TmPAVLOu - 8w0GTYDxcK9tG4RwakO/T7zu0c2upaMt5ZDiY91x+J4j2YhQNXwIsiK34hJenHhvB6dV - r5tgcVyDbqKO0i3nvMXRT4y1o4H1pXSpbR0t9VaePups+N/bTbGvowmzar8zLe3fGNBC - Gc0KDC1CeieASDdqGxatWTFxrWBi49Snc64JQAVlq3E62zYWqEjZpn7HcRHb/bwiFBlD - g3h1DaODrDtao+xnhA562kxL9GB0BLe8bjzQYe6fiE5uGwMCc3ToVHSUsGcq5X1SnZ4P - 3CDOBm23BGPysYG19qAHefuF/ELSRUGXl2M0ubUfUHWqqrrxWTZ66n2atFOL0m4aaQZF - zWqm79SL+i7JupP0XZKC9RC9Yt6DbfMZWmV3rpkF5VjhpW23jNz0vBlISAPSKhOtPId4 - 1/ip0gvhxWGQnTM1qt4LoQyGlwhifZdWj02E5BOOVImVtNthybfnOlV9ewognYdF7b+Q - x4wjNSvmiJo+AxwRAfnZ4KAI+A+Fn5THRi3ij0dQrrXhJ/llNkDC4TkFT7lLbHhZAybn - fTaMnv9kVnK7UAvtwvHo5dUPsgEzc/kBYOb6Wj04yYODHWPD7InwCBv+R0koOxqxoRSM - 2YChmofZdFgYDY2BtwaQhdBbENTtSx0BQzW5aBaEIyeOb/E6wkURmsc1Ij8+oj2xxCuN - xEkP81oyOeadDJ2W1QeJOZ9rjClLRIcPjgaUhGhEvkzFKJ1r7phUbIBunLqq5DpEsuir - LCMR3RXzWufFJmR6vPNoIdpY/Hh5yzSjnYztBU333e5viLL0vLGi8nKh6rvd7u48Uw9j - p76tOFXEQQGBBNByBoeTX8W4xgQTsWPboIbdCRVzLd7faM1FgxY1eGE3xJF7HIe1HWJb - I3YdhBNeKMJuzzeV8d0/D6BK9QplbmRzdHJlYW0KZW5kb2JqCjE0MiAwIG9iagoxNDU0 - CmVuZG9iagoxMzkgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAxNDAgMCBSIC9S - ZXNvdXJjZXMgMTQzIDAgUiAvQ29udGVudHMgMTQxIDAgUiAvTWVkaWFCb3gKWzAgMCAx - MTUyIDczM10gPj4KZW5kb2JqCjE0MyAwIG9iago8PCAvUHJvY1NldCBbIC9QREYgL1Rl - eHQgL0ltYWdlQiAvSW1hZ2VDIC9JbWFnZUkgXSAvQ29sb3JTcGFjZSA8PCAvQ3MyIDEz - IDAgUgovQ3MxIDggMCBSID4+IC9Gb250IDw8IC9GMi4wIDUwIDAgUiAvRjEuMCAxNCAw - IFIgPj4gL1hPYmplY3QgPDwgL0ltMjQgMTQ0IDAgUgovSW0yNiAxNDggMCBSIC9JbTI3 - IDE1MCAwIFIgL0ltNiA0MiAwIFIgL0ltMjUgMTQ2IDAgUiA+PiA+PgplbmRvYmoKMTQ4 - IDAgb2JqCjw8IC9MZW5ndGggMTQ5IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAv - SW1hZ2UgL1dpZHRoIDc4IC9IZWlnaHQgMTAwIC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xv - clNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayAxNTIgMCBSIC9C - aXRzUGVyQ29tcG9uZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB - 7dABDQAAAMKg909tDjeIQGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDgb2BbaAABCmVuZHN0cmVhbQplbmRvYmoKMTQ5IDAgb2JqCjEy - NQplbmRvYmoKMTQ0IDAgb2JqCjw8IC9MZW5ndGggMTQ1IDAgUiAvVHlwZSAvWE9iamVj - dCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDI4NCAvSGVpZ2h0IDcyIC9JbnRlcnBvbGF0 - ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFz - ayAxNTQgMCBSIC9CaXRzUGVyQ29tcG9uZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUg - Pj4Kc3RyZWFtCngB7dABDQAAAMKg909tDwcRKAwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDgYWDvoAABCmVuZHN0 - cmVhbQplbmRvYmoKMTQ1IDAgb2JqCjI5MAplbmRvYmoKMTUwIDAgb2JqCjw8IC9MZW5n - dGggMTUxIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDc4 - IC9IZWlnaHQgMTIyIC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAv - SW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayAxNTYgMCBSIC9CaXRzUGVyQ29tcG9uZW50 - CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dABDQAAAMKg909tDjeI - QGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBj4GBm+EAAEKZW5kc3RyZWFtCmVuZG9iagoxNTEg - MCBvYmoKMTQ4CmVuZG9iagoxNDYgMCBvYmoKPDwgL0xlbmd0aCAxNDcgMCBSIC9UeXBl - IC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggMjYwIC9IZWlnaHQgNzIgL0lu - dGVycG9sYXRlCnRydWUgL0NvbG9yU3BhY2UgMTUgMCBSIC9JbnRlbnQgL1BlcmNlcHR1 - YWwgL1NNYXNrIDE1OCAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0 - ZURlY29kZSA+PgpzdHJlYW0KeAHt0AENAAAAwqD3T20ON4hAYcCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw8DQw22AAAQplbmRzdHJlYW0KZW5kb2JqCjE0 - NyAwIG9iagoyNjgKZW5kb2JqCjE1OCAwIG9iago8PCAvTGVuZ3RoIDE1OSAwIFIgL1R5 - cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCAyNjAgL0hlaWdodCA3MiAv - Q29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAvQml0c1BlckNv - bXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae1baVeT1xZG - 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 - kLYe7OiO9t3rjw8kEoPYIpEYiPff64t2dwSRtu4CbZ2UE9Np62jGgkZtuzMWX4v/Rqij - E81YMB6xxGJ30YylsyN0w98CFOzNWKiHZyxfzNoIS4XL7W1s8cOs7VbH7UhnF7bojNzu - uAWzNn9Lo9ftqrAQx87a0OidnLnC2Jmw2B0ud13D1ebWtuvfBALt2CIQ+OZ6W2vz1YY6 - t8thBwrIwTM5c00zb0QWDDR7F0nJ2bu13OGscXu89T6YvTdhi6uNPl+91+OucTrKreTs - XYoMCGln71n7PBhShUpvJMCDUeGocrlqkAXjP5jC7a6trXG5qhwV4MEgjHqVgqQgvQcD - OCATgcHiIiOKUgtenFKzxWqzgxcHUyMO+dngxbHbrBZzKXhxtODFEfG4yJB0hBfnS0+W - SqMzGItLiFJkySrDFpcvm82lREmx0aDTqE7yZJGJsO3N4wkKJeDNU6m1WsyteUYjac7T - atUq8OZJCgXQC0hv3mEXCpo9HvBoisQS2UX5GbBoqlRg0pRflEnAnXiSRxORQBq2wavL - 4nB5fNKrKwG3KuaQSiSkV5fP4yJvIpW0badxJ5KJQGYCnJCU/Z5t3C3bQiGYtvd5tinQ - DqEQjvBsZ+1594EF8OwyWawd6z4XU2wvHrBZyLwP3n3KCd59aAmQCeQGQ2qHAzYfYIcD - 8w0O+HxyhwPFf4odDkTCDgs5ubu7PFhv8sDHp5Z5YJeHXOaBMjhxs4tk4Txa6dq305WL - LfbW0iCg0+10kQadVDYAXwDsF/vIAFKxwF8IjQzxtH/g92cKp40787sMAxkGMgxkGMgw - kGEgw0BW1j+zx4pkCmVuZHN0cmVhbQplbmRvYmoKMTU5IDAgb2JqCjIzNjgKZW5kb2Jq - CjE1MiAwIG9iago8PCAvTGVuZ3RoIDE1MyAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5 - cGUgL0ltYWdlIC9XaWR0aCA3OCAvSGVpZ2h0IDEwMCAvQ29sb3JTcGFjZQovRGV2aWNl - R3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAvQml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIg - L0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae2Z+U9aWRTHXVBkB0VQloIPN0Ckr2JR0QKB - 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 - dCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDI4NCAvSGVpZ2h0IDcyIC9Db2xvclNwYWNl - Ci9EZXZpY2VHcmF5IC9JbnRlcnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50IDgg - L0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7ZvrU1JbGMbVUOQOiqAggRsU - AZH2AcNrwOB493g3LGFQ0gnDSEeKyWtjSjFeTzpeRs0sMy1HG9Omzj933g3NOCm7zjnf - 2q3nE8O39dvP+66913reuDgkRAARQAQQAUTgVyQQ/5voPz0bYJJwriuU1fkaE2DJ/wJR - lAvwoNESfwvRaLBYAtPP8ETIRLEk0enJUTEoqW+Lo9OTwAIA6Cd0vpFJTEwCLAwmk8Vi - sdlsDkUFS4MFMpmM5GSCz4/pEGiuQCUBGMDC5nC5PD5fQGHx+TwulwOEmIAnSoeksCJo - wDMEGQ6XJxCkpAqFaWkikZiSEonS0oTC1BSBgMflEHTAO1BYseEQriFMQ5DhAxeROD1D - IpFmZsooqcxMqUSSkS4WAR9+hA5Yh4ATY8OKoIFGw2IDGQADVGRyhSILU1JUWJZCIZcB - IcADdNgsou3EhhNP9Bo6A0wjSBWlS4ALpszOUedqNFqtjnLSajWaXHVOthIDPpJ0UaoA - rMOgEx35snHANoAmmcXhCYRiiUyBqXI02jy9wYDj+B8UFCzLYNDnaTU5Kkwhk4iFAh4H - nJNIi1FVYBtow8wIGqkcy87V6Q24seC6uagYVEIxEWsqMl8vMOIGvS43G5NLI3CY0JBj - GCcebJPMZHMFwnSpXKnW5eMmc1FJmcVqs9vt5ZQTLMpmtZSVFJlNeL5OrZRL04UCLpuZ - DMa5WFRR27AAjViqUGn0uKmwxGIrr6iqrq2r/5OCqq+rra6qKLdZSgpNuF6jUhDO4bJi - GYdgAxXFBzRylcZgNJda7ZU19Q3NLW3tDkqqva2luaG+ptJuLTUbDRoVUVZ8DhjnUlFB - SSUls7gpIolcqck3FVvKq+uaWh23nS53t8dzh3LyeLrdLudtR2tTXXW5pdiUr1HKJaIU - wjiXiio+AfZvsE26DFPrjcXWitrGtg6n29Prvefrv++nnO73++55ez1uZ0dbY22Ftdio - V2OydDAO7OMXGw5RUtBtRBJFtg43Wyrqmh2dXT1en39wKPAoSEE9CgwN+n3enq5OR3Nd - hcWM67IVEhHRcaCovn81jrDhpYplWG6+qbQc0Lg83v6BQHB4dGziCQU1MTY6HAwM9Hs9 - LoBTXmrKz8Vk4lReTDZJDDZfmCFX6fBCa3Wjw3Wnzx8Ijk5MToWehymo56GpyYnRYMDf - d8flaKy2FuI6lTxDyGczki75hpbE4BAllaM3ldjr2zo9fQ8CwxNPQ+HZ+YW/KKiF+dlw - 6OnEcOBBn6ezrd5eYtLnEEXFYUAzvlBTNDqTmyLOxHIN5huVTR1dd/2B4SfT4bnFpeXV - 1TXKaXV1eWlxLjz9ZDjgv9vV0VR5w2zIxTLFKVwmPQYbFhfajVKLF9lqWp09PkATmllY - Wlnf2Hq5TTm93NpYX1lamAkBHF+Ps7XGVoRrldBwuKwYbGCbEmZczc4zQkk53N6B4Pj0 - zOLy2ub2zpvdt5TT7pud7c215cWZ6fHggNftgKIy5mVfzRDCRnXJN7CF84REuykoq2i4 - 5fEFRibDC8vrW6929/YP3lNOB/t7u6+21pcXwpMjAZ/nVkNFWQHRcITERnWx3wAbPrBR - G8yWqmZnrz84EZpbWtvaeXvw/vDomHI6Onx/8HZna21pLjQR9Pc6m6ssZoMa2PBjsmHz - 0yRZ0Iqt1S0u7+DjyfDiyiagOTz+eEJBfTw+BDibK4vhyceDXldLtRWacZYkjc+O5Ru2 - IE2Kaa4V2Wrb3H1DI1OzL9a3d/cPj09Ozz5TTmenJ8eH+7vb6y9mp0aG+txttbaiaxpM - miYgYSPKxDR4sb2uvdsXGAvNLW/s7H04Ojn9/IWC+nx6cvRhb2djeS40FvB1t9fZi3EN - likiZwNbOLC56fE9HH82v7L5+t3h8aezL1//ppy+fjn7dHz47vXmyvyz8Yc+z02CjVaJ - 2MCT/h9sUE2R1RTqxaS9GO3hpHs4evcjf/dD3wxk3ww09K1J+q1Jo6MzCtIzCnS2RX62 - hc5ESc9Er6CzdNKzdOJ+Ct3BkNzBoLs7srs7dOdLfueLsgI/ygqgjAl5xoSItKFsUqxs - UhzKtJFm2oANykJCaoskC4kytGQZWsI4KHsdO3sNbIiqQpn9i4m2SN4EzXqQznrEoRmh - yKTHxeR1NKeEZsvIxqeADwEnMnmHZhK/T7VFe06UDjHii2ZZL/GJeCcBzUBfAhP9A83O - k4A5/xsQ/RY6XzH6hQggAogAIoAI/EoE/gEDWNSFCmVuZHN0cmVhbQplbmRvYmoKMTU1 - IDAgb2JqCjE2ODIKZW5kb2JqCjE1NiAwIG9iago8PCAvTGVuZ3RoIDE1NyAwIFIgL1R5 - cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA3OCAvSGVpZ2h0IDEyMiAv - Q29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAvQml0c1BlckNv - bXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae2a6U9aaRTG - XVBkB0VQloIXN0Ckt2JR0QKBqLjU3WKrRkVNsSjVSCR1KcYqkbi2Epe41bhErVFD1Ji2 - 6b82516ddlQcp5k7n4bngwKSH88573su9z3HsLCQ/j8ZCL9Xv5UDoET8UuRf9OvVCHjT - P4BekYBAIkXdIxIJ/oyBHwLirCtQNJkccyXKta6fksnR8DGAfIB3zYqKigYQhUql0Wh0 - Op3xU/AEXqJSKTExGPHveRgsEuIDFIDoDCaTxWZzbojNZjGZDGBSAXjFuydcHAa+MBaD - yeJwYuO43Ph4Ho9/LR4vPp7LjYvlcFhMBsYDfxBucBzmDDOGsdhA4vETEgUCoUgkvpZI - JBQIEhP4PCCycR7Yw3BBFheHQcJodGABCjhiiVSahMh+CkmSSiViYAIQeHQalr7guHAs - Z2QKGOPE8RIEQEJkKalp6XK5QqEEKRRyeXpaaooMAaIggRfHAXsUMrYWd82BNYDF0Bgs - DpcvEEuR5FS5IkOlVqMo+gQXPFCrVRkKeWoyIhUL+FwOiwHuokhBYgVrsABUHCaUICnp - SpUazcp+qs3NA+l02M9c7dPsLFStUqanIBIhjqPCUgQxFw7WYqh0JoebIJTI0pSZqEab - qyvQG4wmk8kMgl9Gg75Al6vVoJnKNJlEmMDlMOnUGDB3O9QrazSA8YXSZLkK1eTo9EZz - YbGltKz8Oa7yslJLcaHZqNflaFCVPFmKuWPSgpnDaBAnG2CSZLk6S5tvMBWVlFdU19TV - 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 - 2xLYvtLs/ngnzkfN9wjJFVFDmAvsqqiZ+DtH7U1x+CwtkXPA1pKwdBsccjolR/5NLVzI - gZIULTna9tUcUDftxpADD0N6bNsW/2jCeOmw6SPzpZh4K7jIcXU9mmr9hW6R8QuNhNds - 35kmOyNyrY1SyuL4bo7e4jEjXNcLTUK3M5CZxAzyk1A21BKP3uN6/qnKB8McK2ezEsq9 - KGe+Jhc+U1FsVuuiJ13FPDNJM19m21iGfakfZGFIvIbyZpyshXjAodehtUPvCHXeD26d - BVn1Vl2u6VUGbfzAV1Dv+SGM8AP/oGaHrAS598oiSHBHXKuyqCvyyDX01sE1M5hCwTBT - dU0FQV3jGvM3PmsPobJICPCpEoCCYivONn/nMTQOTf0wEk9tJoaATZwVbVhc7NguyOj8 - baq1ntrUOy2aS0FaNPfes4PNZo5Rm3+8Be9NfI+EumqwwTAM+F9palSbmroZmtp7g62O - z9YITw42dTjrnjsOuJhw9Lsibg6trwH55HApci6Hcqa8fCj4f8bubZ1xHuCkKb0mRnRi - SGvCubx9O11vOJz+seKBEVE5hpe7NWxH04K8QHHE2OBYBqjXPGTKUz1zPQ0QtUFqn5sU - bGLhggWVyzk+BVcL8ojLBXCxOeemhHRXHObFYxN5EIirFn4OgrFsKm6p4n7puFWWjltk - USRjgkuqdUhvI54ug8WLoa3jFtT7rpZeyvyNz2np+lUvW9Y6bkH9qrvK4L1J3MX2cuG0 - ETP8Kqrr2sHpUg2DmRnvW/xSVNA5C1Obow17lfOsCftYmQK/xg68SIWSPDVQYlXZ8y// - AfWyHKUKZW5kc3RyZWFtCmVuZG9iagoxNjIgMCBvYmoKMTEyMAplbmRvYmoKMTYwIDAg - b2JqCjw8IC9UeXBlIC9QYWdlIC9QYXJlbnQgMTQwIDAgUiAvUmVzb3VyY2VzIDE2MyAw - IFIgL0NvbnRlbnRzIDE2MSAwIFIgL01lZGlhQm94ClswIDAgMTE1MiA3MzNdID4+CmVu - ZG9iagoxNjMgMCBvYmoKPDwgL1Byb2NTZXQgWyAvUERGIC9UZXh0IC9JbWFnZUIgL0lt - YWdlQyAvSW1hZ2VJIF0gL0NvbG9yU3BhY2UgPDwgL0NzMiAxMyAwIFIKL0NzMSA4IDAg - UiA+PiAvRm9udCA8PCAvRjEuMCAxNCAwIFIgPj4gL1hPYmplY3QgPDwgL0ltMjggMTY0 - IDAgUiAvSW0zMCAxNjggMCBSCi9JbTI5IDE2NiAwIFIgPj4gPj4KZW5kb2JqCjE2NCAw - IG9iago8PCAvTGVuZ3RoIDE2NSAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0lt - YWdlIC9XaWR0aCAxODggL0hlaWdodCAxNTIgL0ludGVycG9sYXRlCnRydWUgL0NvbG9y - U3BhY2UgMTUgMCBSIC9JbnRlbnQgL1BlcmNlcHR1YWwgL1NNYXNrIDE3MCAwIFIgL0Jp - dHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt - 0DEBAAAAwqD1T20JT4hAYcCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAgc/AAE7vAAEKZW5kc3RyZWFtCmVu - ZG9iagoxNjUgMCBvYmoKMzk4CmVuZG9iagoxNjggMCBvYmoKPDwgL0xlbmd0aCAxNjkg - MCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggMjY4IC9IZWln - aHQgMTE2IC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1IDAgUiAvSW50ZW50 - IC9QZXJjZXB0dWFsIC9TTWFzayAxNzIgMCBSIC9CaXRzUGVyQ29tcG9uZW50CjggL0Zp - bHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dAxAQAAAMKg9U9tDB+IQGHAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMPAcGGxfAAEK - ZW5kc3RyZWFtCmVuZG9iagoxNjkgMCBvYmoKNDMwCmVuZG9iagoxNjYgMCBvYmoKPDwg - L0xlbmd0aCAxNjcgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lk - dGggMzE2IC9IZWlnaHQgMjc2IC9JbnRlcnBvbGF0ZQp0cnVlIC9Db2xvclNwYWNlIDE1 - IDAgUiAvSW50ZW50IC9QZXJjZXB0dWFsIC9TTWFzayAxNzQgMCBSIC9CaXRzUGVyQ29t - cG9uZW50CjggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dCBAAAAAMOg - +VMf4QKFUGHAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAED - BgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDA - gAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwY - MGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBv7AAP49AAEKZW5kc3RyZWFtCmVuZG9iagox - NjcgMCBvYmoKMTE2NQplbmRvYmoKMTcyIDAgb2JqCjw8IC9MZW5ndGggMTczIDAgUiAv - VHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDI2OCAvSGVpZ2h0IDEx - NiAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJwb2xhdGUgdHJ1ZSAvQml0c1Bl - ckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3d+U9T - WRQHcJZC6d5CaaHLtL6ytbXUJ9UKVVvSBkXABcWpoxC0aCwWq8bGRlxKUBsbRVAISxQZ - IhhgCJgGCVEz/9qcWyAXoerMZOaHPs/56cafvB+/59zW9N2XlYWFAiiAAiiAAv+HQDZH - 6x9ZgUEOrVzOFN1TDmzxb5CsO8D+ebw8ThaPB5sjLD/iSEmsM+Tz+QXrJeBEbWyGz8+H - f2IA+YHGhkReXj4wCIRCkUgkFoslHCnYCmxIKBQUFBCP72sQilzoDIAABrFEKpXJ5QoO - lVwuk0olICIEjnWNbzRKigIyQSQkUplCUVikVBYXq1RqTpRKVVysVBYVKhQyqYRoQDag - UdJjkFSQUBAJOTio1CWlGo1Wp9NzonQ6rUZTWqJWgYc8pQHRIBhpDpQUBQwKkRgkAAIU - 9AajcRdj4kgxu4xGgx5EgAM0xCIyNtJjZJNZwRdAKBRFqhINODCm8orKKrPZYrFmfFks - ZnNVZUW5iQEPTYmqSAHREPDJBN0ZDIgFUBSIJDKFUq3RG5myCrNlt81uZ1l2LwcKtmG3 - 23ZbzBVljFGvUSsVMgkkI4+XpksgFjA2hSkKrYEpr7La7GzNvv3O2jooV4YX2UOtc/++ - GtZus1aVMwZtCkMIAzRNMLIhFgVCsVShLNEaTJXWatbhrHUdcnvqvV6vL+MLNlHvcR9y - 1TodbLW10mTQligVUrGwAIKxvUnWYyECCrXWWGa2sY4DLne9r+FoY1Nzy3EOVEtzU+PR - Bl+923XAwdrMZUaSDKkoXTCIBXSIHCgMZWZ7jfOgx3vkWMuJ1tNtZ/2cqLNtp1tPtBw7 - 4vUcdNbYzWWkTeQSCMaOJoEWyS8QSQtVGoPJXO2oc/sam0+d8Z9v7+i8FAh0ZXwFApc6 - O9rP+8+cam70uesc1WaTQaMqJMHY0STZOXCeQixK9EylrabO09B0su1ce2fgSvBaqOd6 - OOPrek/oWvBKoLP9XNvJpgZPXY2tktGXQDDgXN0+MEiLwLRQaYzlVtbpbmhu9V+4eDkY - Ct+6HbkT5UDdidy+FQ4FL1+84G9tbnA7WWu5UaMiEwOa5OuPnikLWZFaz1RVOw76gKIj - EOy5GYn23n8Q6+NAxR7c741GbvYEAx2A4TvoqK5i9OoiWVqLfIFYriw1lFnZA57Gk/6O - ru5wJHo/1v84/jTBgXoaf9wfux+NhLu7OvwnGz0HWGuZoVQpFwvyd+SCly+QkBapsDlc - 3pa2C4HuG5He2KN44vmLwZccqMEXzxPxR7HeyI3uwIW2Fq/LYasgTSIRwPDc1iM8vlBa - qNYxVXbn4SOnzl28Go709j1JDAwNj4yNjWd8jY2NDA8NJJ709UbCVy+eO3XksNNexejU - hVIhP42FSArjwmRha+uPnWm/HAKK+LPB4dGJ15NvpzK+3k6+nhgdHnwWB4zQ5fYzx+pr - WYsJBoZUlMYCjhFl6S/lu2ugRfydwZvRh0+eDY2Mv5mafjczm/E182566s34yNCzJw+j - N4OdfmiSmt3lv5Qq4SDZkQs4UmVKMi72HWo48VsgFLnXnxgcmZj8feb93PxCxtf83PuZ - 3ycnRgYT/fciocBvJxoO7SMDQ0kOku3zAizkYFFpd7qPtrZfCUdj8YHh8cnp2fmFxaXl - jK+lxYX52enJ8eGBeCwavtLeetTttFeChTythVherNkFo9PTeLojeOtuf2Jo9A1QLC5/ - SHKgPiwvAsab0aFE/91bwY7TjR4Ynrs0xXJxulyIFcVaxryntr6prbP79r3Hz19NTM3M - LS4nVz6uZnx9XEkuL87NTE28ev743u3uzram+to9ZkZbrPiGhUrHmNk6b/PZS6HIg/jA - yOvp938sJVdW1zhQqyvJpT/eT78eGYg/iIQunW321rFmRqf6tgUcqWDxa6DnTuzpi9HJ - d3OLH4Di0+eMr09rqysfFufeTY6+eBq70xP4lVhYTD+0aPEHrkf7EkNjb2fml5IfgeJL - xtfnT2sfk0vzM2/HhhJ90esBOFS/ZQFf2QvECpUulYs0Fn9meH35vsVX/8uXnZsHX0fg - Y6d1r8t33N8Vhly8HJ+aXVhOrq59/pLhEvDX//J5bTW5vDA7Nf4SchHu8h/3ufZa4YMn - fCHJy0ULtMBcYI/QOYcWaEEF6ApzgRZUgK4wF2hBBegKc4EWVICuMBdoQQXoCnOBFlSA - rjAXaEEF6ApzgRZUgK4wF2hBBegKc4EWVICuMBdoQQXoCnOBFlSArjAXaEEF6ApzgRZU - gK4wF2hBBegKc4EWVICuMBdoQQXoCnPx7yzwt670mbMfWPxMv4HO2mqBv41P/R4cn5mA - VknlAp+lSQ0NYoHPWK3PT7DAZ+82jhJigc9kbuSCh8/qbsQiK4fHx2e4N3sEn+3fjAXk - Au982MTIycW7QKgFOUjwjhjigXcHbaYiKwvvlNpqgXeNbWrgHXSbEqRHyJWVeDdhSgTv - rNweDLzLlIjgHbc0F2Ri4N3HGx54J/ZXwYCzBO9KT4ngHfpbg0HaBN+tsC6C79zYkoys - DQ3ySpqf/F0sRCWlkYPv6NlICL67aWurpNZAwsnasVH8AxRAARRAART4TwT+AtfdYA0K - ZW5kc3RyZWFtCmVuZG9iagoxNzMgMCBvYmoKMTk0NAplbmRvYmoKMTc0IDAgb2JqCjw8 - IC9MZW5ndGggMTc1IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dp - ZHRoIDMxNiAvSGVpZ2h0IDI3NiAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJw - b2xhdGUgdHJ1ZSAvQml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2Rl - ID4+CnN0cmVhbQp4Ae3Z/09T9x7Hcfne71+gtFDoWk/51tbSddRVQNcSCIqUqSiubkLQ - qllZsdPY2Ax1JUwbG0VwEL5EkRHRgCNgCBKj5v5r932qudugvtySm/vDPe/3D8uSp2Y5 - j7w/n3Nge/bwsAALsAALsAAL/O8F8niyAv9Inv5G/h9TINn5wyCfSP4G4Xs38iosLOIh - gcJCwhAZP8WXlXvPVlxSIns/cknOh4cvKSl+D/gJvQ9yRUXFxCZXKJRKpUqlUkt06NEJ - QKGQy2SiX6G4fB/dPZGugE4qwRGbSq3RaHU6vYRHp9NqNGoSVBDfe72P4GXpaOdEObVG - q9eXlhkM5eVGo0mSYzSWlxsMZaV6vVajFvVo92j1cuOJWycunSinIzejqaLSbK6qrrZI - cqqrq8zmygqTkfx0WT1aPREvxws3S0cXnVJFcgRHaharzbZXsEt0hL02m9VCgsRHeiql - eO3lxssT77oSOS2dvsxYYSY3wV5bV9/gcDidLsmN0+lwNNTX1doF8jNXGMv0tHryEvGN - sXvxaO2ITqZUa/UGk9liE2rqHM59bo/H6/V+IcGhx/Z43PucjroawWYxmwx6rZo2r6gw - x6mltaPXhCJLV2UVahtcbo+3af+X/uYWmlaJjfjMzf4v9zd5PW5XQ61grcriKeiFkWPx - 8mjtZAqVRm+oqLLa612NXp+/ufVQINjW3t7eIbmhh24LBg61Nvt93kZXvd1aVWHQa1QK - GS3ezkP7fu2URGeqstU43F7fgdZAW0fnka7uUM/XEpyeUHfXkc6OtkDrAZ/X7aixiZun - UeZaPNGOTqyO6Kw1Dk+T/2Cw/fDRnmO9J/tOhyU5p/tO9h7rOXq4PXjQ3+Rx1IjHVqem - xdt1aOnIFsuUmlKj2Wp3NPpaAh1doROnwt/1Dwyej0QuSG4ikfODA/3fhU+dCHV1BFp8 - jQ671WwsFRdv16HNy6fvE1q7CotQ725qCXZ2H+870z8YuRT9ITZ8OS65uTwc+yF6KTLY - f6bveHdnsKXJXS9YKmjx6Dtl54UnHlm67YxmW63L6w90hnrDZ89djMbiV68lriclONcT - 167GY9GL586Ge0OdAb/XVWszG8Ubjw7tX3+0yNppy0wWoaHRd7CD6AYi0eErieTIzVup - UQlO6tbNkWTiynA0MkB4HQd9jQ2CxVSmzWlXLFfpDJXWGpf3QLDreHjgwlA8kbyZGrud - vpuR4NxN3x5L3Uwm4kMXBsLHu4IHvK4aa6VBp5IX79q7wmK5WjyydW5fa3tP39nI0I+J - kdQv6cz9BxMPJTgTD+5n0r+kRhI/DkXO9vW0t/rcdeKhVcvpZbHjzBaWKDSlpmqhweP/ - 6vCJM+e+jydGRu9kxienpmdn5yQ3s7PTU5PjmTujI4n49+fOnDj8ld/TIFSbSjWKkhx2 - Sg1dd3ant7nt6Kn+izGiS9+bmJqZf7TwZFFy82Th0fzM1MS9NOHFLvafOtrW7HXa6cLT - KHPY0WvWUPlZ7b4mOrLhweiV5M937k1Ozz1eXHq6/Exys/x0afHx3PTkvTs/J69EB8N0 - aJv21X5WaaAX7a69o08UrUG87vYf6jz2bSSWuDGWmZieX/ht+fnK6gvJzerK8+XfFuan - JzJjNxKxyLfHOg/tFy88g/ii3XnfkZ2O7Oo9/sCR3v5L8WQqPT41t7D0bPXF2vqG5GZ9 - 7cXqs6WFuanxdCoZv9TfeyTg99STnS6nnUpXbt5Lr4pg18mB6NWfxjKTM4+Jbm3j5aYE - 5+XGGuE9npnMjP10NTpwsitIL4u95nKdKtfeqfTlVYLj8+a27r7BoWs3bt//dX5xeWVt - Y3Pr1bbk5tXW5sbayvLi/K/3b9+4NjTY193W/LlDqCrXf8TOWC04vC3todPnY4lb6fHp - R0vPf1/f3Np+LcHZ3tpc//350qPp8fStROz86VB7i9chVBs/bkefKGT3TWT4eurug5mF - pytrL4nuzVvJzZvX21sv11aeLsw8uJu6Phz5RrRz2j9p1xOOXE6OZiZnnyyvrm++Irp3 - kpu3b16/2lxfXX4yO5kZTV6O0EfKx+zoV1Ayld5Ynd27HHb/kti8w3Z/+a17XkER/ThL - P1a4vmjt+Dp8IU5793Bu8dmLjc3t12/fSUyOHvfd29fbmxsvni3OPaS9i18If93R+oWL - frCgH2iLCtgObQTbIR3c2A77oMp2SAc3tsM+qLId0sGN7bAPqmyHdHBjO+yDKtshHdzY - DvugynZIBze2wz6osh3SwY3tsA+qbId0cGM77IMq2yEd3NgO+6DKdkgHN7bDPqiyHdLB - je2wD6psh3RwYzvsgyrbIR3c2A77oMp2SAc3tsM+qLId0sGN7bAPqmyHdHBjO+yDKtsh - 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 - R1ug9YDP63bU2IhOvO2Kd9uJh5YWT0V4FVVWe72r0evzN7ceCgTb2tvbOyQ39NBtwcCh - 1ma/z9voqrdbqyqITkVrt+vI7ske2mI6tVpx86xCbYPL7fE27f/S39xC0yqxEZ+52f/l - /iavx+1qqBXEA6vX0onNtXZkR4tXIlNm8cwWm1BT53Duc3s8Xq/3CwkOPbbH497ndNTV - CDaLOUunlJXQ2u287uiXefS2IDy5Uq3RlxkrzBarTbDX1tU3OBxOp0ty43Q6HA31dbV2 - wWa1mCuMZXqNWknfJ4W73hTi70Fp8QqKimnzVBpdqcFoMldVk59tr2CX6Ah7beRWXWU2 - GQ2lOo2Ktk48sTnW7gMeHVsFrZ6utIz4KirNJFhtkeRUk5q5soLgykhOrVTQgf0Y3Z68 - 7OYVFcuyelq9nvwM5eVGo0mSYzSWlxvITa/XZuXoNZGl2/Fx9+F/XWTxCoto9UhPqVJr - NFqdTi/h0em0Go1apaSdE5eO7rr8vNx0dGpp88Q3hnjtyeQKAlSqVCq1RIcenQAUCjnB - 0c6Jch+nE18Y7/WIj/wIMDtySc6Hhy8R3YoKPymXfd2KevkFBQWFIiCPyFYgrhzcuQ+3 - nrh8WT/xz9PQ35TovH/+7D+J5D88f+df6M/zkMDfseI/wwIswAIswAIs8N8W+De3TURj - CmVuZHN0cmVhbQplbmRvYmoKMTc1IDAgb2JqCjQwMTgKZW5kb2JqCjE3MCAwIG9iago8 - PCAvTGVuZ3RoIDE3MSAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9X - aWR0aCAxODggL0hlaWdodCAxNTIgL0NvbG9yU3BhY2UKL0RldmljZUdyYXkgL0ludGVy - cG9sYXRlIHRydWUgL0JpdHNQZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0ZURlY29k - ZSA+PgpzdHJlYW0KeAHtnPs3lO33xzsoOZNxPs84NI5NZERCpJwSGpESDWocy9NookRk - ouQQERmHqChROj7V+vxr3/e+7pkxGOR5yjzfte79Q43WvZrXvb2vfe1rrWu/d+zgg88A - nwE+A6bKwM7/SGzp/cG8azl2myyWGXYB6RdegeMGr5nZnv9EmJkBhl5jM3xGzmHvNTff - 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 - Cjw8IC9UeXBlIC9QYWdlIC9QYXJlbnQgMTQwIDAgUiAvUmVzb3VyY2VzIDE3OSAwIFIg - L0NvbnRlbnRzIDE3NyAwIFIgL01lZGlhQm94ClswIDAgMTE1MiA3MzNdID4+CmVuZG9i - agoxNzkgMCBvYmoKPDwgL1Byb2NTZXQgWyAvUERGIC9UZXh0IC9JbWFnZUIgL0ltYWdl - QyAvSW1hZ2VJIF0gL0NvbG9yU3BhY2UgPDwgL0NzMiAxMyAwIFIKL0NzMSA4IDAgUiA+ - PiAvRm9udCA8PCAvRjIuMCA1MCAwIFIgL0YxLjAgMTQgMCBSID4+IC9YT2JqZWN0IDw8 - IC9JbTMyIDE4MiAwIFIKL0ltMzMgMTg0IDAgUiAvSW0zMSAxODAgMCBSIC9JbTM0IDE4 - NiAwIFIgPj4gPj4KZW5kb2JqCjE4MiAwIG9iago8PCAvTGVuZ3RoIDE4MyAwIFIgL1R5 - cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA0NTggL0hlaWdodCAzMTYg - L0ludGVycG9sYXRlCnRydWUgL0NvbG9yU3BhY2UgMTUgMCBSIC9JbnRlbnQgL1BlcmNl - cHR1YWwgL1NNYXNrIDE4OCAwIFIgL0JpdHNQZXJDb21wb25lbnQKOCAvRmlsdGVyIC9G - bGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt0AENAAAAwqD3T20PBxEoDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG - DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA - AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw - YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDPwPDKBiAAEK - ZW5kc3RyZWFtCmVuZG9iagoxODMgMCBvYmoKMTkxNgplbmRvYmoKMTg0IDAgb2JqCjw8 - IC9MZW5ndGggMTg1IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dp - ZHRoIDQ1OCAvSGVpZ2h0IDMwNiAvSW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAx - NSAwIFIgL0ludGVudCAvUGVyY2VwdHVhbCAvU01hc2sgMTkwIDAgUiAvQml0c1BlckNv - bXBvbmVudAo4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QMQEAAADC - oPVPbQ0PiEBhwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABA+8DA2q2AAEKZW5kc3RyZWFtCmVuZG9iagoxODUgMCBvYmoKMTg1NwplbmRvYmoK - MTgwIDAgb2JqCjw8IC9MZW5ndGggMTgxIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlw - ZSAvSW1hZ2UgL1dpZHRoIDQ1OCAvSGVpZ2h0IDI5MCAvSW50ZXJwb2xhdGUKdHJ1ZSAv - Q29sb3JTcGFjZSAxNSAwIFIgL0ludGVudCAvUGVyY2VwdHVhbCAvU01hc2sgMTkyIDAg - UiAvQml0c1BlckNvbXBvbmVudAo4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVh - bQp4Ae3QMQEAAADCoPVPbQsviEBhwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGPgNDBTWAAEKZW5kc3RyZWFtCmVuZG9iagoxODEg - MCBvYmoKMTc2MQplbmRvYmoKMTg2IDAgb2JqCjw8IC9MZW5ndGggMTg3IDAgUiAvVHlw - ZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDI4NiAvSGVpZ2h0IDI0OCAv - SW50ZXJwb2xhdGUKdHJ1ZSAvQ29sb3JTcGFjZSAxNSAwIFIgL0ludGVudCAvUGVyY2Vw - dHVhbCAvU01hc2sgMTk0IDAgUiAvQml0c1BlckNvbXBvbmVudAo4IC9GaWx0ZXIgL0Zs - YXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QAQ0AAADCoPdPbQ43iEBhwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB - AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg - wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM - GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGPgeGD9d - AAEKZW5kc3RyZWFtCmVuZG9iagoxODcgMCBvYmoKOTUxCmVuZG9iagoxOTAgMCBvYmoK - PDwgL0xlbmd0aCAxOTEgMCBSIC9UeXBlIC9YT2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAv - V2lkdGggNDU4IC9IZWlnaHQgMzA2IC9Db2xvclNwYWNlCi9EZXZpY2VHcmF5IC9JbnRl - cnBvbGF0ZSB0cnVlIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNv - ZGUgPj4Kc3RyZWFtCngB7dr7T5Np+gZwkVPPtFBaKDDUcixYaoc65aACW4IiMCqKVlcI - WDXCFjsaGpsBFdbRro0gzEA4BBGJYMAhYAgSo+b7r32ft7rZGam3sz9sXu7kun+Y+eHW - zDXXx+d53xb37cOgATSABtAAGkADaAANoAHuDSRg9mAD/9WfKpF//38mEbMnGviPyH4B - 9BdAPymK7ElJyZg910BSkqCRUL+FGXP8hJiSmqr4NEqM7A18pkhNTRF/uATnNyw/OyYn - pwhEpUqlVqs1Go0WswcaEBCCQ6VSKhSSJm0pQSaKO1UwCkSNVqdL0+sNmD3SgF6fptNp - hadKYH6y/MoVG4MU51Fy1OrSDIb0DKMxM9NkMmNkb8Bkysw0GjPSDYY0nVayFOdSXLHx - KaUTKR1IyVEvFE3mrGyLJSc3Nw8jewO5uTkWS3aW2SQ09TFLcSwlyjgvsTFI8YBUa4Sj - YBSGeflW6wFbAWYPNGA7YLXm5wlPgSksNWrpcRmfMkF6RqYqxYE0ZJiyLELRVlBUXFJq - t5eVlWNkbaCszG4vLSkuKrAJTUuWKcMgjqUyVXrv2X0oxZEUkAq1Ns1gNFvyrLbCYnvZ - QYfT6XK5vsfI3IBAcDodB8vsxYU2a57FbDSkacWpTE6Kc7+KIyledlQxyJx8W1FpucPp - qjz8g6e6RkwtRsYGJIFqzw+HK11OR3lpkS0/J0apEq89cQ5lgjiSCpVGZzBm5eQXlJRX - uNye6tqjdfUNXq+3ESNrA4Kgob7uaG21x+2qKC8pyM/JMhp0GpVCHMovr9dPR1ItIM05 - 1kK7w+Wuqq1raGw60dzS2vYjRuYG2lpbmk80NTbU1Va5XQ57oVU6lTp1vEMpSYq7VS8g - 8wvtzkrPkXrv8ZNtp9rPdpz3YWRv4HzH2fZTbSePe+uPeCqd9kLpgtVrxaHcdb2KyzVF - odalmyz5BfYKd01dY3PrmXO+v3d2dV/x+69iZG3A77/S3dX5d9+5M63NjXU17gp7Qb7F - lC4dyl3Xa8J+8QlEHMmsPFuJo7KmvqnldMfFzm7/9d5/BPpvBjGyNnCzP/CP3uv+7s6L - HadbmuprKh0ltrwscSjFJ5EvH5TS5SqekiaLtajc5alram33Xe651hsI3h4I3QljZG7g - TmjgdjDQe63nsq+9tanO4yovslpM0pNSXK9//ponJpmWYc6zlVa4jzQKyC5/b/+tUHjw - 7r3hEYzMDQzfuzsYDt3q7/V3CcrGI+6KUlueOSMtrmSKUqM3ZucXlruq6ptP+7qu9gVD - 4bvDDx5GHkcxMjfwOPLwwfDdcCjYd7XLd7q5vspVXpifbdRrlCm7zmRSilIrXa7FDnet - t63jsr/vp9Dg8C+R6OjT8V8xMjcw/nQ0GvlleDD0U5//ckebt9btKJauV61SvPJ8cbsm - pap06eZcW6nTc+z4mYs9N4KhwZFH0bGJyamZmVmMrA3MzExNToxFH40MhoI3ei6eOX7M - 4yy15ZrTdarUOJJqnXhMFpS5qhtOnuu8FhCQkSfjk9Nz8wvPFzGyNvB8YX5uenL8SURQ - Bq51njvZUO0qKxAPSp06jqR4dTVmf1d0sFJcrr7u3lvh+4+eTEzNPltcerm8gpG1geWX - S4vPZqcmnjy6H77V2+0T12vlwaLvso3i5XXXmRQfQtKM0mPy8NGmU5f8gdDQg+j41NzC - i+VXq2uvMbI2sLb6avnFwtzUePTBUCjgv3Sq6ehh6UFplF5ev3xOCkm9kCxxeupOtHde - D4aHI2OTswtLK2uv1zc2MbI2sLH+em1laWF2ciwyHA5e72w/UedxlghJfVxJjT7TckC8 - 8NQ3n+3qvf3zg+jE9DMBub75ZgsjcwNvNtcF5bPpieiDn2/3dp1trhevPAcsmXpNvDOp - MWTm2OyHqhtaOrr7BoYejv42t7i8ur65tf12ByNrA2+3tzbXV5cX534bfTg00Nfd0dJQ - fchuy8k0fEXSlGuzu2q8reevBEL3ImNT80uvft/Y2t55h5G5gZ3trY3fXy3NT41F7oUC - V863emtcdluu6euS4kOIkLzg778z/Pjp9MLL1fU3AvL9B4ysDbx/t7P9Zn315cL008fD - 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 - YpBqRao4kl8+JsUPK8U7j6BUqrU6Q4Ypy5KXb7UVFBWXlNrtZRjZG7DbS0uKiwps1vw8 - S5Ypw6DTqsUnkKRd7zvST53FoUxMThGnUqPTpxtNZoslV2haD9gKMHugAdsBq1DMtVjM - JmO6XqcRJ1K6W+Mcyc+U4oJViWOpN2QIzKxsiyUnNzc3DyNzAwIhx2LJzhKMGQa9OJAq - cbV+DXJfQuxUJqcoYpZpekN6htGYmWkymTGyN2AyZWYajRnpBn1azFG87MQgv/gw+fmv - 9MQok5I/Wao1Wp0uTa83YPZIA3qBqNNq1OI8So7iGbk/IT6kuF/FqZTee6THpUKpUqnF - aDQaLUb2BgSDpKFSKRXSAzLm+HVI6bXnk6XAFJqC89MoMTI38G+JVEkxOUk6j6Rj7BVW - styfmJiYJHFi9lgDAjFRYvymY+yJmRA7mdIvl0b8TsweaOCTRuyfAujzq81f/Jf4DZg9 - 1sBfpMMvQwNoAA2gATSABtAAGkADaAAN/O8b+H/bfQ8dCmVuZHN0cmVhbQplbmRvYmoK - MTkxIDAgb2JqCjQ1NTkKZW5kb2JqCjE4OCAwIG9iago8PCAvTGVuZ3RoIDE4OSAwIFIg - L1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA0NTggL0hlaWdodCAz - MTYgL0NvbG9yU3BhY2UKL0RldmljZUdyYXkgL0ludGVycG9sYXRlIHRydWUgL0JpdHNQ - ZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt2+tX - k2fWBnDlDDlDDpAQiAmncIoRNAIiUGjkrKIoilA0SgcEUaYpLBELRWWgIkKlolTwhIwo - FRejlhHX+6+99xOdd6rG3ZlPD/td1/7Qrq7dtXp5/bzv50mkW7Zg0AAaQANoAA2gATSA - BtAA9wa2YjZhA//V7yqRP+TfE4rZFA38WyREAP0HoO8VRfawsHDMpmsgLEzQSKh/hhlw - fI8YERkZ9X6iMbI38IEiMjJC/OYSnH9i+cExPDxCIEbHxCgUCqVSqcJsggYEhOCIiYmO - ipI0aUsJMlTcqYJRICpVarVGq9VhNkkDWq1GrVYJzxiB+d7yC1dsAFKcR8lRpdbodLFx - er3BYDSaMLI3YDQaDHp9XKxOp1GrJEtxLsUVG5xSOpHSgZQctULRaIpPMJstiYlWjOwN - JCZazOaEeJNRaGoDluJYSpRBXmIDkOIBqVAKR8EoDK3JNts2uwOzCRqwb7PZkq3CU2AK - S6VCelwGp9wqPSMjo8WB1MUZ481C0e5ITUvPcDozM7MwsjaQmel0ZqSnpTrsQtMcb4zT - iWMZHSm993x+KMWRFJBRCpVGpzeZrTZ7SpozMzvH5XK73TswMjcgEFyunOxMZ1qK3WY1 - m/Q6jUqcyvCwIPerOJLiZScmAGlJtqdmZOW43Hk7d3kKCsUUYWRsQBIo8Ozamed25WRl - pNqTLQHKGPHaE+RQbhVHMipGqdbp4y3JjvSsXHe+p6CouKS0rLy8vAIjawOCoKy0pLio - wJPvzs1KdyRb4vU6tTImShzKT6/X90dSISBNFluKM8edv7uopKzCW1lVU1tXj5G5gbra - mqpKb0VZSdHufHeOM8UmnUq1ItihlCTF3aoVkMkpTleeZ09p+b7quv0NhxqPNGFkb+BI - 46GG/XXV+8pL93jyXM4U6YLVqsSh/Ox6FZdrRJRCHWs0JzucufmFJRVVtQcPNzW3tLad - 8vlOY2RtwOc71dba0tx0+GBtVUVJYX6u05FsNsZKh/Kz63VriPgEIo5kvNWenpNXWOqt - OdB4rKXN195xtqv7XA9G1gbOdXed7Wj3tbUcazxQ4y0tzMtJt1vjxaEUn0Q+fVBKl6t4 - ShrNttQst6fEW9vQdOLkmY6unt7v/H39GJkb6PN/19vT1XHm5ImmhlpvicedlWozG6Un - pbheP/6aJyCpiTNZ7Rm5+XsqBGSrr6P7gr9/YPDy0DBG5gaGLg8O9PsvdHf4WgVlxZ78 - 3Ay71RSnCSoZEa3U6hOSU7Lcu0urDjS1nu7s8fcPDo1cHR0bx8jcwNjo1ZGhwX5/T+fp - 1qYDVaW73VkpyQl6rTI64rMzGRYRrZIu17Sc/KLyusYTvs7z/oGhK6PjE5M3pzEyN3Bz - cmJ89MrQgP98p+9EY115UX5OmnS9qqLFK88nt2tYZIw61pRoz3B59u47eOzkX3r8A8PX - xm9M3ZqZnb2DkbWB2dmZW1M3xq8ND/h7/nLy2MF9ez2uDHuiKVYdExlEUqEWj0lHprug - rPpwy5kuATl6/eat23d/nV+4j5G1gYX5X+/evnXz+qig7DrTcri6rMCd6RAPSrUiiKR4 - ddUnJKVm54nLtamt40L/D9euT83cuXf/4ePFJxhZG1h8/PD+vTszU9ev/dB/oaOtSVyv - edmpSQl68fL62ZkUH0I0eukxubPYu/+4r8t/aWT85szd+QeLS0+Xn2FkbWD56dLig/m7 - MzfHRy75u3zH93uLd0oPSr308vrpc1JIaoVkustTUtnQ0t7TPzR649ad+YdPlp+tvFjF - yNrAi5Vny08ezt+5dWN0qL+nvaWhssTjSheS2qCSSq3BvE288JRWHWrt6L04Mj51+56A - XFl9uYaRuYGXqyuC8t7tqfGRi70drYeqSsUrzzazQasMdiaVOoPF7txeUFbT2Nb53aWr - Ez/fvb/4dGV17dXrNxhZG3j9am115eni/bs/T1y99F1nW2NNWcF2p91i0H1B0phod7oL - y2uPnOryXx69MfPrw6XnL9ZevVnHyNzAm1drL54vPfx15sboZX/XqSO15YVupz3R+GVJ - 8SFESB71dfcNjU3enn/8dOWlgHy7gZG1gbfrb169XHn6eP725NhQX7fvqCSZ6fhTybom - 37n+4fGp2YXF5RdrrwXkO4ysDWy8XX+99mJ5cWF2any4/5xPfAz5kqT4Q60opc6YGDiT - QST/ByNjA+9oyY9+/mNraLj42lV8xZO1o6iivul0jziT03fuP3m2uvZmfeOdjL8K/KdF - A+821t+srT57cv/OtDiTPaeb6iuKdmSJL3nEF6/hoZDk85sEknys6KSQpPvhs4UkHys6 - KSTpfvhsIcnHik4KSbofPltI8rGik0KS7ofPFpJ8rOikkKT74bOFJB8rOikk6X74bCHJ - x4pOCkm6Hz5bSPKxopNCku6HzxaSfKzopJCk++GzhSQfKzopJOl++GwhyceKTgpJuh8+ - W0jysaKTQpLuh88Wknys6KSQpPvhs4UkHys6KSTpfvhsIcnHik4KSbofPltI8rGik0KS - 7ofPFpJ8rOikkKT74bOFJB8rOikk6X74bCHJx4pOCkm6Hz5bSPKxopNCku6HzxaSfKzo - pJCk++GzhSQfKzopJOl++GwhyceKTgpJuh8+W0jysaKTQpLuh88Wknys6KSQpPvhs4Uk - Hys6KSTpfvhsIcnHik4KSbofPltI8rGik0KS7ofPFpJ8rOikkKT74bOFJB8rOikk6X74 - bCHJx4pOCkm6Hz5bSPKxopNCku6HzxaSfKzopJCk++GzhSQfKzopJOl++GwhyceKTgpJ - uh8+W0jysaKTQpLuh88Wknys6KSQpPvhs4UkHys6KSTpfvhsIcnHik4KSbofPltI8rGi - k0KS7ofPFpJ8rOikkKT74bOFJB8rOikk6X74bCHJx4pOCkm6Hz5bSPKxopNCku6HzxaS - fKzopJCk++GzhSQfKzopJOl++GwhyceKTgpJuh8+W0jysaKTQpLuh88Wknys6KSQpPvh - s4UkHys6KSTpfvhsIcnHik4KSbofPltI8rGik0KS7ofPFpJ8rOikkKT74bOFJB8rOikk - 6X74bCHJx4pOCkm6Hz5bSPKxopNCku6HzxaSfKzopJCk++GzhSQfKzopJOl++GwhyceK - TgpJuh8+W0jysaKTQpLuh88Wknys6KSQpPvhs4UkHys6KSTpfvhsIcnHik4KSbofPltI - 8rGik0KS7ofPFpJ8rOikkKT74bOFJB8rOikk6X74bCHJx4pOCkm6Hz5bSPKxopNCku6H - zxaSfKzopJCk++GzhSQfKzopJOl++GwhyceKTgpJuh8+W0jysaKTQpLuh88Wknys6KSQ - pPvhs4UkHys6KSTpfvhsIcnHik4KSbofPltI8rGik0KS7ofPFpJ8rOikkKT74bOFJB8r - Oikk6X74bCHJx4pOCkm6Hz5bSPKxopNCku6HzxaSfKzopJCk++GzhSQfKzopJOl++Gwh - yceKTgpJuh8+W0jysaKTQpLuh88Wknys6KSQpPvhs4UkHys6KSTpfvhsIcnHik4KSbof - PltI8rGik0KS7ofPFpJ8rOikkKT74bOFJB8rOikk6X74bCHJx4pOCkm6Hz5bSPKxopNC - ku6HzxaSfKzopJCk++GzhSQfKzopJOl++GwhyceKTgpJuh8+W0jysaKTQpLuh88Wknys - 6KSQpPvhs4UkHys6KSTpfvhsIcnHik4KSbofPltI8rGik0KS7ofPFpJ8rOikkKT74bOF - JB8rOikk6X74bCHJx4pOCkm6Hz5bSPKxopNCku6HzxaSfKzopJCk++GzhSQfKzopJOl+ - +GwhyceKTgpJuh8+W0jysaKTQpLuh88Wknys6KSQpPvhs4UkHys6KSTpfvhsIcnHik4K - SbofPltI8rGik0KS7ofPFpJ8rOikkKT74bOFJB8rOikk6X74bCHJx4pOCkm6Hz5bSPKx - opNCku6HzxaSfKzopJCk++GzhSQfKzopJOl++Gz/O8kopc6Y6Mh0F5bXNfnO9Q+PT80u - LC6/WHu9vrHxjs8v+v9j0ncbG+uv114sLy7MTo0P95/zNdWVF7ozHYlGnTIqPHTrlj9O - SPiXJd9uvMPI2sDGW0Iy5I+OW7Z8JHnU1903NHZzdv7x8m8vX71Zf7uBkbWBt+tvXr38 - bfnx/OzNsaG+bt/RP57JL0g6xe1ae+RU1/eXRyd/ufdo6fnq2uvf1/+JkbWB9d9fr60+ - X3p075fJ0cvfd506UituV+eH2zWopMXu3F7wVU1j21n/4LWJW3MPFpdXXq69fvM7RtYG - 3rxee7myvPhg7tbEtUH/2bbGmq8KtjvtlsBzMoik1mDZ5nTtLq0+/E1H78CV8enZ+UdL - y7+trv3jFUbWBv6xtvrb8tKj+dnp8SsDvR3fHK4u3e1ybrMYtOKN53NJhVZvtmW4PCWV - DS3fnu8fHp2cmVt4vLS88mL1JUbWBlZfrCwvPV6Ym5kcHe4//21LQ2WJx5VhM+u1iqCS - GiGZlrOz2Hug+XS3//KVn6Z+mVt49OTvy89XMLI28Hz5708eLcz9MvXTlcv+7tPNB7zF - O3PShKTmS5IJyWnZ+Xsq6ptOdvZeHB6dmL49N//g8eISRuYGFh8/mJ+7PT0xOnyxt/Nk - U33FnvzstOSEoJJhUQp1XLw1JXNHoXjlaW0/57/0498mpmdm5+bvP8DI3MD9+bnZmemJ - v/14yX+uvVW88BTuyEyxxsepFVFhnz4nwyJj1LEmq8O53VNa2dB8quNC3+DI6PVJYXln - DiNzA3eE4+T10ZHBvgsdp5obKks9250OqylWHRMZTFKlM1q2pefmF39df6T1TFdv/+Dw - tbHrk1PTP9/CyNrAz9NTk9fHrg0P9vd2nWk9Uv91cX5u+jbxIUQVRDI0IlopXl6TU7N3 - FJRVNxxra++68P3A5R+vjo79dH0CI2sD138aG7364+WB7y90tbcda6guK9iRnZosXl2V - 0RGhn96uoRFRCo0+Xlyvrl3F3trDx9vOdPb8te/i4A/DI1cwMjcwMvzD4MW+v/Z0nmk7 - frjWW7zLJS7XeOmFJ4hkuHjliTVZbGniUJbuqz98vNX3bVdPr7+v/+IARuYGLvb3+Xt7 - ur71tR4/XL+vVBzJNJtFPCbFh5BPz+TWkPDIGJVOnyAOZW5+0VeVdQ1Hm9t87R1nu3vO - X+jFyNrAhfM93Wc72n1tzUcb6iq/KsrPFUcyQS89JsNDPv5DrS1CUrpe40xmW2qma9ee - Mm/N/kNHj7d8c9J3pr39W4ysDbS3n/Gd/Kbl+NFD+2u8ZXt2uTJTbWZTnHS5BpEMC4+S - DqUpUVBu31m4t9xbXXegofFo0/Hm5hMYWRtobj7edLSx4UBdtbd8b+HO7QIy0SQdyajw - sM/PZGh4ZLRCrTMkWKVTmecp3FtW4a2qqa3ff+AgRuYGDuyvr62p8laU7S305Ekn0ppg - 0KkV0ZHiMfnJ7SquV+lQKjWxAUpn9va8XQVFxaVl5RVfe737MLI24PV+XVFeVlpcVLAr - b3u2MwAZq1EGO5JbhKQ4lFEKlTbOkJBoc6Q5s13u/J2egsKiPcUY2RvYU1RY4NmZ73Zl - O9MctsQEQ5xWpYgKdiSFpDiU0v2qjTXEW5K2CcvM7FyX252Xj9kEDeS53a7c7EzhuC3J - Em+I1Qbu1rCQzy5X8ZM84lBGRAlKTazeZE5MstlT0tIznJlZ2dnZORhZGxAEWZnOjPS0 - FLstKdFs0sdqBKR4cQ0N+eQbHumnswKHUqJUqXVxBlOCxZpks9kdjpSU1NQ0jKwNpKam - pDgcdpstyWpJMBnidGpVADLokdyyVTwpwwKnUqnW6uL0RlO82WxJtFqTkpKSMbI2IAis - 1kSL2RxvMurjdFq18j2keHH99M31w6EUlOK1J1qhVGt0AlNvMJpMpnjMJmhAQBgNesGo - 0wQcI8PDw8TdGgwycL+KZ2V4hGQp7li1RqvT6WJj4zCboIHYWIGh1ajFvSrOY2REuPSM - /ALkB0pxLIVlVHSMQqFQqgQoZnM0oFIpBUlMdFTAUTqQX4QUlOK1JyRUumMjJE3hGR0d - g9kUDQgKSSQyQhzHsNCAY/Cr9cP/XBCwlDCFppiIwERiZG7gvUOAJOw9Y/B3nQ+K/4cp - nczA4QwVE4bZFA1IFoGjKGS2Bn1l/ZjxX/8k/l1pAqL4yyZp4L0Jeaf+yw9/RwNoAA2g - ATSABtAAGkADaAANoAE08B828L8e5FpyCmVuZHN0cmVhbQplbmRvYmoKMTg5IDAgb2Jq - CjQ2NzEKZW5kb2JqCjE5MiAwIG9iago8PCAvTGVuZ3RoIDE5MyAwIFIgL1R5cGUgL1hP - YmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCA0NTggL0hlaWdodCAyOTAgL0NvbG9y - U3BhY2UKL0RldmljZUdyYXkgL0ludGVycG9sYXRlIHRydWUgL0JpdHNQZXJDb21wb25l - bnQgOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAHt2utXU+e2BnC5hEsS - coGQQLjFBBLCLUaQAIrAhqIgCqIgVqBoLFsUYYtQUSyXLYoyFIRKBRVEN3hBUSoVS9Vx - /rXzrtiOvStx9vSMccZinvHMD/bD1NHH58f7rkVkyxYMGkADaAANoAE0gAbQABrg3kAA - ZhM28Je+qkT+wH9PEGZTNPBvkUAB9D8A/aQosgcHKzCbroHgYEEjof4Zps/xE2JIaGjY - pwnHyN7AbxShoSHii0tw/onlb44KRYhADFcqVSqVWq2OwGyCBgSE4FAqw8PCJE3aUoIM - EneqYBSI6giNRqvT6TGbpAGdTqvRRAhPpcD8ZPmFK9YHKc6j5Bih0er1kVEGQ3S00WjC - yN6A0RgdbTBERer1Wk2EZCnOpbhi/VNKJ1I6kJKjTigaTTGxZnNcfHwCRvYG4uPjzObY - GJNRaOp8luJYSpR+XmJ9kOIBqVILR8EoDBOSLJatVhtmEzRg3WqxJCUIT4EpLNUq6XHp - nzJAekaGhosDqY8yxpiFotWWYnekOp1paekYWRtIS3M6Ux32FJtVaJpjjFF6cSzDQ6X3 - no2HUhxJARmmitDqDSZzgsWabHemZWS6XG63eztG5gYEgsuVmZHmtCdbLQlmk0GvjRCn - UhHs534VR1K87Ch9kHFJ1pTU9EyXO3tHrie/QMxOjIwNSAL5ntwd2W5XZnpqijUpzkep - FK89fg5lgDiSYUq1Rm+IiUuyOdKz3Dme/J2FRcUlpaWlZRhZGxAEJcVFhTvzPTnurHSH - LSkuxqDXqJVh4lB+fr1+OpIqAWmKsyQ7M905eTuLSsrK91bsq9p/ACNzA/ur9lXsLS8r - KdqZl+POdCZbpFOpUfk7lJKkuFt1AjIp2enK9uwqLt1Tub+69lBdfQNG9gbq6w7VVu+v - 3FNavMuT7XImSxesLkIcyg3Xq7hcQ8JUmkijOcnmzMopKCqrqDp4uOFYU3PLCa/3JEbW - BrzeEy3NTccaDh+sqigrKsjJctqSzMZI6VBuuF4DAsV3IOJIxiRYHZnZBcXl+2rqjja1 - eFvbzrSf7ejEyNpAx9n2M22t3pamo3U1+8qLC7IzHdaEGHEoxXcinz8opctVPCWNZktK - uttTVF5V29B4/Nu29s6u7p4LvRiZG7jQ093V2d727fHGhtqq8iKPOz3FYjZKT0pxvf7x - Yx6fpDbKlGBNzcrZVSYgm71tZ8/19PZ93z84hJG5gcH+7/t6e86dbfM2C8qyXTlZqdYE - U5TWr2RIuFpniE1KTnfnFVfUNDSfPN3Z0/v94JWrIzdGMTI3cGPk6pXB73t7Ok+fbG6o - qSjOc6cnJ8UadOrwkA1nMjgkPEK6XO2ZOTtL99c1ek//o6dvcHhk9Nb47UmMzA3cHr81 - OjI82Nfzj9Pexrr9pTtzMu3S9RoRLl55Prtdg0OVmkhTvDXV5dm95+DR46c6e/qGro2O - TdyZmp6ewcjawPT01J2JsdFrQ309naeOHz24Z7fHlWqNN0VqlKF+JFUa8Zi0pbnzSyoP - N33bLiBHbt6+c/feg7mH8xhZG3g49+De3Tu3b44IyvZvmw5XluS702ziQalR+ZEUr66G - 2MSUjGxxuTa0tJ3rHbh2c2JqZnb+8cLiE4ysDSwuPJ6fnZmauHltoPdcW0uDuF6zM1IS - Yw3i5XXDmRTfhGgN0mNyR2F59dfe9p7LV0ZvT92be7T49PnSC4ysDSw9f7r4aO7e1O3R - K5d72r1fV5cX7pAelAbp5fXz56SQ1AlJh8tTtLe2qbWzd3Bk7M7M3OMnSy+WX69gZG3g - 9fKLpSeP52bujI0M9na2NtXuLfK4HEJS51dSrYs2bxUvPMUVh5rbui5dGZ24Oysgl1d+ - WsXI3MBPK8uCcvbuxOiVS11tzYcqisUrz1ZztE7t70yq9dFxVue2/JJ9dS2nuy9fvfXD - vfnF58srq2/X3mFkbWDt7erK8vPF+Xs/3Lp6uft0S92+kvxtTmtctP4LksZ4q9NdUFpV - f6K9p39kbOrB46cvX6++fbeOkbmBd29XX798+vjB1NhIf0/7ifqq0gK30xpv/LKk+CZE - SB7xnr0weGP87tzC8+WfBOT7DxhZG3i//u7tT8vPF+bujt8YvHDWe0SSTLP9qeT+Bm9H - 79DoxPTDxaXXq2sC8iNG1gY+vF9fW329tPhwemJ0qLfDK74N+ZKk+EetMLXeGO87k34k - /wsjYwMfack//PxHQJBCfOwqPuJJ376z7EDDyU5xJidn5p+8WFl9t/7ho4x/C/yvRQMf - P6y/W1158WR+ZlKcyc6TDQfKdm5PFx/yiA9eFUGQ5PNFAkk+VnRSSNL98NlCko8VnRSS - dD98tpDkY0UnhSTdD58tJPlY0UkhSffDZwtJPlZ0UkjS/fDZQpKPFZ0UknQ/fLaQ5GNF - J4Uk3Q+fLST5WNFJIUn3w2cLST5WdFJI0v3w2UKSjxWdFJJ0P3y2kORjRSeFJN0Pny0k - +VjRSSFJ98NnC0k+VnRSSNL98NlCko8VnRSSdD98tpDkY0UnhSTdD58tJPlY0UkhSffD - ZwtJPlZ0UkjS/fDZQpKPFZ0UknQ/fLaQ5GNFJ4Uk3Q+fLST5WNFJIUn3w2cLST5WdFJI - 0v3w2UKSjxWdFJJ0P3y2kORjRSeFJN0Pny0k+VjRSSFJ98NnC0k+VnRSSNL98NlCko8V - nRSSdD98tpDkY0UnhSTdD58tJPlY0UkhSffDZwtJPlZ0UkjS/fDZQpKPFZ0UknQ/fLaQ - 5GNFJ4Uk3Q+fLST5WNFJIUn3w2cLST5WdFJI0v3w2UKSjxWdFJJ0P3y2kORjRSeFJN0P - ny0k+VjRSSFJ98NnC0k+VnRSSNL98NlCko8VnRSSdD98tpDkY0UnhSTdD58tJPlY0Ukh - SffDZwtJPlZ0UkjS/fDZQpKPFZ0UknQ/fLaQ5GNFJ4Uk3Q+fLST5WNFJIUn3w2cLST5W - dFJI0v3w2UKSjxWdFJJ0P3y2kORjRSeFJN0Pny0k+VjRSSFJ98NnC0k+VnRSSNL98NlC - ko8VnRSSdD98tpDkY0UnhSTdD58tJPlY0UkhSffDZwtJPlZ0UkjS/fDZQpKPFZ0UknQ/ - fLaQ5GNFJ4Uk3Q+fLST5WNFJIUn3w2cLST5WdFJI0v3w2UKSjxWdFJJ0P3y2kORjRSeF - JN0Pny0k+VjRSSFJ98NnC0k+VnRSSNL98NlCko8VnRSSdD98tpDkY0UnhSTdD58tJPlY - 0UkhSffDZwtJPlZ0UkjS/fDZQpKPFZ0UknQ/fLaQ5GNFJ4Uk3Q+fLST5WNFJIUn3w2cL - ST5WdFJI0v3w2UKSjxWdFJJ0P3y2kORjRSeFJN0Pny0k+VjRSSFJ98NnC0k+VnRSSNL9 - 8NlCko8VnRSSdD98tpDkY0UnhSTdD58tJPlY0UkhSffDZwtJPlZ0UkjS/fDZQpKPFZ0U - knQ/fLaQ5GNFJ4Uk3Q+fLST5WNFJIUn3w2cLST5WdFJI0v3w2UKSjxWdFJJ0P3y2kORj - RSeFJN0Pny0k+VjRSSFJ98NnC0k+VnRSSNL98NlCko8VnRSSdD98tpDkY0UnhSTdD58t - JPlY0UkhSffDZwtJPlZ0UkjS/fDZQpKPFZ0UknQ/fLaQ5GNFJ4Uk3Q+fLST5WNFJIUn3 - w2cLST5WdFJI0v3w2UKSjxWdFJJ0P3y2kORjRSeFJN0Pny0k+VjRSSFJ98NnC0k+VnRS - SNL98NlCko8VnRSSdD98tpDkY0UnhSTdD58tJPlY0UkhSffDZwtJPlZ0UkjS/fDZQpKP - FZ0UknQ/fLaQ5GNFJ4Uk3Q+fLST5WNFJIUn3w2cLST5WdFJI0v3w2f5vJNO2F5QdaDjZ - 2Ts0Ojkz/+TFyuq79Q8fP/L5S/9/TPrRj2TB9jRbgkkfEa4ICtjynxOoCFPrjfG2NHdB - 6f4Gb4eQnJh+uLj0enVt/b2gxMjZwIf362urr5cWH05PjA71dngb9pcWuNNs8Ua9OkwR - +J+OW7ZslLxxe3puYenVm7Vffv2AkbmBX39Ze/NqaWFu+vaNvyJZdcTb/t3A9fG7c/96 - trzy89r6r+8xsjbw6/razyvLz/41d3f8+sB37d4jVX92JuOsTnf+36rqjrf39I+MTd1/ - 9PTFqzc/r/2yjpG1gV/Wfn7z6sXTR/enxkb6e9qP11X9Ld/ttMZ98XaNFpLb8koq61ra - zl8evjk583Dh2cuVN6tv1zCyNvB29c3Ky2cLD2cmbw5fPt/WUldZkrdNSEb7f06qdNHm - rakuT3HFoeZT5y7+88b4j/cfLT57+UpYYmRt4M3Kq5fPFh/d/3H8xj8vnjvVfKii2ONK - 3WqO1qn8vfGodAazxZGVu3vPwcbWjgsD125NTs8+Wni29HL5FUbWBpZfLj1beDQ7PXnr - 2sCFjtbGg3t252Y5LGbDFyS1htgke0ZO4VfVR71nzveJQ3lnenZ+YfHp8yWMrA08f7q4 - MD87fUccyb7zZ7xHq78qzMmwJ8UatH7OZHCYShMVk5iSnl1QWlX/zanO3v7hUUF5f27+ - 8QJG5gYez8/dF5Cjw/29nae+qRevrtnpKYkxURpVWPDn308Ghyo1kaYEm9OdJx6UjSfb - z18cuDo6Njk1fe/B7BxG1gZmH9ybnpocG706cPF8+8lG8ZjMczvFRzyRGmWoX0m9Kd6a - 6sotLK9uaGnt6L40MHz95vjkD1M/3sXI2sCPUz9Mjt+8PjxwqbujtaWhurww15VqjTfp - /UqGhEfoo80We4Z0vR4+dqKto/ti/9DV66O3xsYxMjcwdmv0+tWh/ovdHW0njh2WLtcM - u8UcLT52DdlwJoNCwtQ6Q2yiLW2bp2hPdX2j99TZru8u9Q9eGb42gpG5gWvDVwb7L33X - dfaUt7G+ek+RZ1uaLTHWoFOHhQR9/pwMUkivPKb4rY7MnILSipr6xuOtZzq7enr7Lvf3 - D2BkbaC//3Jfb09X55nW4431NRWlBTmZjq3xJumFR7FBUnyErtSI6zUpOW1bbmFZZU3d - 183e1rb2znNd3T0YmRvo7jrX2d7W6m3+uq6msqwwd1tacpK4XDVK8cHAZ2cyIFARGi6u - V3Eo7RnuvN1lFQdqjxxrbvG2/r3t9Jl2jKwNnDnd9vdWb0vzsSO1ByrKdue5M+ziSIrL - NTxUEfjHf57cEhAYHCKuV310bILVkbE9r7CkvPLAwbojR481NX/TgpG5gW+am44dPVJ3 - 8EBleUlh3vYMhzUhVhxJVZh44dkgGSQdSm2k0Zxoc2S4cwsKS8r2VlZV19QeOlyHkbmB - w4dqa6qrKveWlRQW5LozHLZEszFSKx3JoM8ltwQGKcShjNBFmXyUruzc/F1FJaVfle+t - qNyHkbmByoq95V+VlhTtys/NdvkgTVG6CHEkN7zwbJGuV3Eoxf1qEJRWuzPD5c7x5Bfs - KiwqLi7ByNxAcXFR4a6CfE+O25XhtFsTzSaDuFvFkdxwuUqS0qFUqn2UCRab3Zme6XJv - z9mR6/HkYWRuwOPJ3ZGz3e3KTHfabZYEH6Ra6TuSnz0mJUlxKD9RRhlj4xMtthS7My09 - IzPL5dqGkbkBlysrMyM9zWlPsVkS42ONUXqNDzI4cMNj0ncoxf0qnUpdpMEUG5eQZLHa - klPsDkdqqhMjawOpqQ6HPSXZZrUkJcTFmgyROglS3K0b33fED9qJQxnko1RFaPVRBlOM - 2RyfkJhksVi2YmRvQDAkJSbEm80xJkOUXhuh+g3Sz5H8nTIkLFyl1mj1kQZDtMkUE2uW - Jg4jawM+hNgYkynaYIjUazVqVbh4RooT6RdyS8CnUxkSKllGaLQ6vT4yyiAmGiN7A5JD - VKRer9NqIiTH0N8gN7zv+H6M2UcZpFBIlkqVpKnRaLVaHWYTNCAgBIdQVCl9joog6UT6 - hxT3qziV4mEZ7MMME5zCE7N5GlAKxDDpOCqCpZv1y5DSa49k+QlTERISEhoaKv4oZlM0 - IDAEieJ3RtJRumMDPmEGBgWJwykdT8xmaUDyECzSWROMX7pYfQ/K338Rv813Nn1/Br9s - sgYknd+l/tJ/pT+Ikb+Bv4SG34wG0AAaQANoAA2gATSABtAAGvi/b+C/AbArU9sKZW5k - c3RyZWFtCmVuZG9iagoxOTMgMCBvYmoKNDU1MAplbmRvYmoKMTk0IDAgb2JqCjw8IC9M - ZW5ndGggMTk1IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRo - IDI4NiAvSGVpZ2h0IDI0OCAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvSW50ZXJwb2xh - dGUgdHJ1ZSAvQml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+ - CnN0cmVhbQp4Ae3Z/TuUaRsH8DLDYN6ZF2YMY4ZhvI3JyPuaGpHyllIjJTVSSkipKaVE - KSURRQpZsSnRarVtOp5/7bnu0R7nU+dod3/c+znPH7bvfo/qOO7Pntd1z9gtW2hIgARI - gARI4N8usPX/ZP7hfyemEgAj4O/AQ7JH/ltIGzJMRCgM/L8YoVAoEHBOfy3ks9mACRKJ - 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 - 6WATaEgHLHAiHWwCDemABU6kg02gIR2wwIl0sAk0pAMWOJEONoGGdMACJ9LBJtCQDljg - RDrYBBrSAQucSAebQEM6YIET6WATaEgHLHAiHWwCDemABU6kg02gIR2wwIl0sAk0pAMW - OJEONoGGdMACJ9LBJtCQDljgRDrYBBrSAQucSAebQEM6YIET6WATaEgHLHAiHWwCDemA - BU6kg02gIR2wwIl0sAk0pAMWOJEONoGGdMACJ9LBJtCQDljgRDrYBBrSAQucSAebQEM6 - YIET6WATaEgHLHAiHWwCDemABU6kg02gIR2wwIl0sAk0pAMWOJEONoGGdMACJ9LBJtCQ - DljgRDrYBBrSAQucSAebQEM6YIET6WATaEgHLHAiHWwCDemABU6kg02gIR2wwIl0sAk0 - pAMWOJEONoGGdMACJ9LBJtCQDljgRDrYBBrSAQucSAebQEM6YIET6WATaEgHLHAiHWwC - DemABU6kg02gIR2wwIl0sAk0pAMWOJEONoGGdMACJ9LBJtCQDljgRDrYBBrSAQucSAeb - QEM6YIET6WATaEgHLHAiHWwCDemABU6kg02gIR2wwIl0sAk0pAMWOJEONoGGdMACJ9LB - JtCQDljgRDrYBBrSAQucSAebQEM6YIET6WATaEgHLHAiHWwCDemABU6kg02gIR2wwOmf - 6QQEBkuUmihzkj3XVe72tHp7BobHp18tLq+ufVpf/4L/+n95w+l8WFlaeDk5OtjX1XH6 - SHVJQWaqJSYiXBYaJAzY8u38SOfz+hfezfr6p48fVt761xFs/RZnyzc6hzznLt+892h8 - au710vvfPn76vM67+fzH72ury4vzLycfP+jrOn+qbt//7M6mOlZ2ssoOnmjp7O4fevJi - duHtyura75/+4N18+rT24f3S67mpiZGBW1fam+qqigscKfEbJ8u/jlpvsqbn7Nxb03D2 - 4vU7g6OTM68Wl96vrq195N2srX34dfnNwuyLp0N3e7xtJ2srd+UznWgtd+/41VGo9bFW - W7az9MCx5o6u3oGR8anZhcV3K7+ufuDdrK6uLL/9ZW7m2ejgne7OFo+7oig3IznOoA3b - REesUOmMCbaswt3VR5vavD39D8eeTf+8sLj0boWHs7z05pe5l8+fDg/0dV04c/xgmSvX - nmRmOtIQv7sjljMdS2pmQXFVXeO5zut994efTE7Pzv+y+OYt7+bN4usFhjP+eLD/prf9 - 1LEDe3Zk263mKI1yc53IGEuKI6+o3H28uePKzf7BkSeTUy9/fjW/wLuZn597OT05Pjo0 - 0Hut81zjkerdhdttibF6tVISEojvHWGwWBYeYYhjHwfZtVzf1NrZdat/cHhsfHJq+iUP - Z2bq+cSTkaGBvm7v+ebj7kr2ykqzGHUqhTjYn44oVBamNZit6dzFc/hEc/vl67f67w+N - jD2deDbJu3k2MT72+NHgvb4bVy60nDxaw66dbeyFrlPJmU4A+jQoFIVIlRp9rCXNkV9U - cbC+seX85Ws9t+89ePho5PHjUb7N45HhocGB/t7uKxdaTzXU7tvtzEq3mg3si4RfHUFQ - iIS9tGLiU+w5ztJq97Gms+c7r3b39PXfG7j/gHdz//69/tu9N655L5w7faLuQHlRviMt - ITaKe6H72x1BYDB7aUWwo2XLLNhVtr+24eSZtguXrl670XOrt49303ur58b1Lm9ne8up - E0cOVu525tiT2cFSs1eWSIhPFqfDLh690ZJiz3aWlO+vrfecOtt6/uIl75WrXbybq1e8 - lzs72lqaGxvqaqpKXXmOtER2sFRySTD+ir5la0CgKFSqVEUazIlpjrwdJWXVB+uOeZpO - n2lpbWs/z7tpb28719Lc5Gk46j5QWeoqyLInxRt1mjDu2hF8/wMMpiMMYkcrTKszxrGz - lecs3lNZfbD2yLEGT+PJJj5Oo+d4w9E694GqshJXQbY9xRLLVkcpDRX51wkM5pZHG2WM - T7I5cgp2FpeWVVYfOOiuPVzHwzlc6z5UU11VvrfE5czLsqckmAyRaiVbnSD8Qme7IwgU - hYhlSlWEj2fb9twCp6t4956y8orKKh5OZWVF2d7SkqKdP+VlO9JTLKZonSZcLmVvLHwp - b+GOFlseiTxMHcl4rCm2jMzsvIJC505XUTEvZ1eRa4fzp/zcLIc9LYnD0aoUvtURoFcW - pyMIZDePlPGw7TFbmI89IzMrOzc3L7+Ah5Ofn5ebk7XdYbelJiXExRoYDjtXISK2OuhS - 5nTY8rCzJVWEqbX6aOaTmJSSZku3b8tw8HIyttnttrSUZKslzhRjiNSEK2WSUHbr+Fud - LVsCfMvDeOTsatZFRRtN5nhLotWanJzCz0lOsiYmWOLMxhiDLkIdruBwfKvz/bcs7kfw - vuUJCmY8MmW4WhupizLEGGNNZnNcXDwPJy7ObDbHGo3RBr1Oq1Ep5TKxD8f/6mzZusEj - Cg4Vy+TKcJVGGxGp00cZ2ETzcdhzRel1ukhGo1KyxRGHsGMlFAT4uZO/Lo9AGBgoYusj - kckVyrBwlVqj0bKJ4ONwD6ZRq1ThSrY3Um5xfoTjO1sBzCeI8xFLpDI5I1Iqw9iE82/Y - U7GHUyrkMplUwmzY4mxsjr9bx/c//7jDxa0P8wkOCRUzIolUKuPtSKUSCXvI0JBgbm98 - NgFbN8Vh28N4AgQ+oCARI2JIbEL5OdyjcY8oCuJouBvnhza+y+dPILZCvgni82w8IpPh - aP7S5uv54jaIG8GfI+Tf/PloG0/KZH5wpHws3/yD/XbffP3TvPzlz2f8RzDfKNG/kAAJ - kAAJkAAJkMC/XeC//wXAvQplbmRzdHJlYW0KZW5kb2JqCjE5NSAwIG9iagozOTg2CmVu - ZG9iago0IDAgb2JqCjw8IC9UeXBlIC9QYWdlcyAvUGFyZW50IDE5NiAwIFIgL0NvdW50 - IDggL0tpZHMgWyAzIDAgUiAyNiAwIFIgMzQgMCBSIDYzIDAgUgo3NSAwIFIgOTUgMCBS - IDExNSAwIFIgMTE5IDAgUiBdID4+CmVuZG9iagoxNDAgMCBvYmoKPDwgL1R5cGUgL1Bh - Z2VzIC9QYXJlbnQgMTk2IDAgUiAvQ291bnQgMyAvS2lkcyBbIDEzOSAwIFIgMTYwIDAg - UiAxNzYgMCBSIF0KPj4KZW5kb2JqCjE5NiAwIG9iago8PCAvVHlwZSAvUGFnZXMgL01l - ZGlhQm94IFswIDAgNjEyIDc5Ml0gL0NvdW50IDExIC9LaWRzIFsgNCAwIFIgMTQwIDAg - UiBdCj4+CmVuZG9iagoxOTcgMCBvYmoKPDwgL1R5cGUgL0NhdGFsb2cgL091dGxpbmVz - IDIgMCBSIC9QYWdlcyAxOTYgMCBSIC9WZXJzaW9uIC8xLjQgPj4KZW5kb2JqCjIgMCBv - YmoKPDwgL0xhc3QgMTk4IDAgUiAvRmlyc3QgMTk5IDAgUiA+PgplbmRvYmoKMTk5IDAg - b2JqCjw8IC9QYXJlbnQgMjAwIDAgUiAvVGl0bGUgKENhbnZhcyAxKSAvQ291bnQgMCAv - RGVzdCBbIDMgMCBSIC9YWVogMCA3MzMgMCBdCi9OZXh0IDIwMSAwIFIgPj4KZW5kb2Jq - CjIwMSAwIG9iago8PCAvUGFyZW50IDIwMiAwIFIgL1ByZXYgMjAzIDAgUiAvQ291bnQg - MCAvVGl0bGUgKENhbnZhcyA5KSAvRGVzdCBbIDI2IDAgUgovWFlaIDAgNzMzIDAgXSAv - TmV4dCAyMDQgMCBSID4+CmVuZG9iagoyMDQgMCBvYmoKPDwgL1BhcmVudCAyMDUgMCBS - IC9QcmV2IDIwNiAwIFIgL0NvdW50IDAgL1RpdGxlIChDYW52YXMgMikgL0Rlc3QgWyAz - NCAwIFIKL1hZWiAwIDczMyAwIF0gL05leHQgMjA3IDAgUiA+PgplbmRvYmoKMjA3IDAg - b2JqCjw8IC9QYXJlbnQgMjA4IDAgUiAvUHJldiAyMDkgMCBSIC9Db3VudCAwIC9UaXRs - ZSAoQ2FudmFzIDYpIC9EZXN0IFsgNjMgMCBSCi9YWVogMCA3MzMgMCBdIC9OZXh0IDIx - MCAwIFIgPj4KZW5kb2JqCjIxMCAwIG9iago8PCAvUGFyZW50IDIxMSAwIFIgL1ByZXYg - MjEyIDAgUiAvQ291bnQgMCAvVGl0bGUgKENhbnZhcyAxMSkgL0Rlc3QgWyA3NSAwIFIK - L1hZWiAwIDczMyAwIF0gL05leHQgMjEzIDAgUiA+PgplbmRvYmoKMjEzIDAgb2JqCjw8 - IC9QYXJlbnQgMjE0IDAgUiAvUHJldiAyMTUgMCBSIC9Db3VudCAwIC9UaXRsZSAoQ2Fu - dmFzIDcpIC9EZXN0IFsgOTUgMCBSCi9YWVogMCA3MzMgMCBdIC9OZXh0IDIxNiAwIFIg - Pj4KZW5kb2JqCjIxNiAwIG9iago8PCAvUGFyZW50IDIxNyAwIFIgL1ByZXYgMjE4IDAg - UiAvQ291bnQgMCAvVGl0bGUgKENhbnZhcyA0KSAvRGVzdCBbIDExNSAwIFIKL1hZWiAw - IDczMyAwIF0gL05leHQgMjE5IDAgUiA+PgplbmRvYmoKMjE5IDAgb2JqCjw8IC9QYXJl - bnQgMjIwIDAgUiAvUHJldiAyMjEgMCBSIC9Db3VudCAwIC9UaXRsZSAoQ2FudmFzIDEw - KSAvRGVzdCBbIDExOSAwIFIKL1hZWiAwIDczMyAwIF0gL05leHQgMjIyIDAgUiA+Pgpl - bmRvYmoKMjIyIDAgb2JqCjw8IC9QYXJlbnQgMjIzIDAgUiAvUHJldiAyMjQgMCBSIC9D - b3VudCAwIC9UaXRsZSAoQ2FudmFzIDgpIC9EZXN0IFsgMTM5IDAgUgovWFlaIDAgNzMz - IDAgXSAvTmV4dCAyMjUgMCBSID4+CmVuZG9iagoyMjUgMCBvYmoKPDwgL1BhcmVudCAy - MjYgMCBSIC9QcmV2IDIyNyAwIFIgL0NvdW50IDAgL1RpdGxlIChDYW52YXMgNSkgL0Rl - c3QgWyAxNjAgMCBSCi9YWVogMCA3MzMgMCBdIC9OZXh0IDIyOCAwIFIgPj4KZW5kb2Jq - CjIyOCAwIG9iago8PCAvUGFyZW50IDIyOSAwIFIgL1ByZXYgMjMwIDAgUiAvQ291bnQg - MCAvRGVzdCBbIDE3NiAwIFIgL1hZWiAwIDczMyAwIF0gL1RpdGxlCihDYW52YXMgMykg - Pj4KZW5kb2JqCjIzMCAwIG9iago8PCAvUGFyZW50IDIyNiAwIFIgPj4KZW5kb2JqCjIy - OSAwIG9iago8PCA+PgplbmRvYmoKMjI3IDAgb2JqCjw8IC9QYXJlbnQgMjIzIDAgUiA+ - PgplbmRvYmoKMjI2IDAgb2JqCjw8ID4+CmVuZG9iagoyMjQgMCBvYmoKPDwgL1BhcmVu - dCAyMjAgMCBSID4+CmVuZG9iagoyMjMgMCBvYmoKPDwgPj4KZW5kb2JqCjIyMSAwIG9i - ago8PCAvUGFyZW50IDIxNyAwIFIgPj4KZW5kb2JqCjIyMCAwIG9iago8PCA+PgplbmRv - YmoKMjE4IDAgb2JqCjw8IC9QYXJlbnQgMjE0IDAgUiA+PgplbmRvYmoKMjE3IDAgb2Jq - Cjw8ID4+CmVuZG9iagoyMTUgMCBvYmoKPDwgL1BhcmVudCAyMTEgMCBSID4+CmVuZG9i - agoyMTQgMCBvYmoKPDwgPj4KZW5kb2JqCjIxMiAwIG9iago8PCAvUGFyZW50IDIwOCAw - IFIgPj4KZW5kb2JqCjIxMSAwIG9iago8PCA+PgplbmRvYmoKMjA5IDAgb2JqCjw8IC9Q - YXJlbnQgMjA1IDAgUiA+PgplbmRvYmoKMjA4IDAgb2JqCjw8ID4+CmVuZG9iagoyMDYg - MCBvYmoKPDwgL1BhcmVudCAyMDIgMCBSID4+CmVuZG9iagoyMDUgMCBvYmoKPDwgPj4K - ZW5kb2JqCjIwMyAwIG9iago8PCAvUGFyZW50IDIwMCAwIFIgPj4KZW5kb2JqCjIwMiAw - IG9iago8PCA+PgplbmRvYmoKMjAwIDAgb2JqCjw8ID4+CmVuZG9iagoxOTggMCBvYmoK - PDwgL1BhcmVudCAyMjkgMCBSIC9QcmV2IDIzMCAwIFIgL0NvdW50IDAgL0Rlc3QgWyAx - NzYgMCBSIC9YWVogMCA3MzMgMCBdIC9UaXRsZQooQ2FudmFzIDMpID4+CmVuZG9iagoy - MzEgMCBvYmoKPDwgL0xlbmd0aCAyMzIgMCBSIC9MZW5ndGgxIDEzMzIwIC9GaWx0ZXIg - L0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ad17a3hU1dXw3vtc58wlM5O5XzIzmcxMJvcL - CYQEMoYkhEsiEIUECSZAICBUwBiECm9UMBARReSiUFvUchUzhAgDiKW8IKJW0VqoVK22 - aG0/89i3H9pWkpl37TMhJWnt4/c8Pv3xzcna97PP2muvtfZa65y0Lr+3GalRO2LQlJlN - S+cj+Zc7CyHywtwlTUvj9cQShPC2uW2t7nidS0WIWTx/6YIl8br4JEKSc8HilQP3Gx0I - 2XtampvmxftRH+SFLdAQr+MRkKe0LGm9L17X90C+fvHdcwf6De9BvXJJ030Dz0cfQN39 - g6YlzfHxuaMgT1l69z2t8XrORchbli5vHhiP6wC/txGG1mR0N1Kgu5CACNLC1YCQ8Lnk - RCz00n74zctQbrkzoeQrpBPl+p3Vj8n5q56XL/2tuS+g3Cz+HRoUN8bTnA9GgwipMPT3 - KjcP9sj3QZIcQbXpETQBoBSgACA9/RYLasd70OMAPwFg0EL8CFoJsAHgKQB2sLQfasfx - I92sGDqBVyIbnhhSsq7bDFaXRVK63o1gvucZ1/uW35/EVti9T7C1W40Ut0j4J/jHaB5y - 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 - JPBvmftk/9YOvmRTqND+qRX9w891gqPr0kkeWKs9KWhx/ZO76/a861kwEFEZVImXwOcd - sF7BqKdGPnV6S3vxt/u9voJ8owDq55/8X5LYA79/9oJdb755/volWVdCAnHaZvh29F/9 - kqGRgbV5IKrih69gs+HLw3x4z1eOKlCl/GXqBPgYm35/WoNulb+QnQZfvd6OpqMZqA7V - o5loFjotT0ylFsslHt6zopry8TMmTEqval7c1ty6cG4T9MR76RAIHtP3CegFgJcBqKf1 - AcAXAH0wUAXgAMgAKAGYDDALYDHA/QAbAXYBvADwMsCbAB8AfAHQB0yuAnAAZACUAEwG - mAWwGOB+gI0Au2IDP3gmGixj5B5Wh/uH9I8dVr9lWH3csDoY3EPuB1yG1KuH1acMq985 - rE4peTO+c4bV5w6rzxtWl/ngpvXOH9a/YFi9ZVh94bD6XcPqQOMh+Mn/E3PT86jXeTP+ - dw+rLx1WXz6sDl8xDLlf/p+Xm+a/d1h/27D6imH1lUPr12Uu/V/bNTvvCmVuZHN0cmVh - bQplbmRvYmoKMjMyIDAgb2JqCjg2MzgKZW5kb2JqCjIzMyAwIG9iago8PCAvVHlwZSAv - Rm9udERlc2NyaXB0b3IgL0FzY2VudCA3NzAgL0NhcEhlaWdodCA3MTcgL0Rlc2NlbnQg - LTIzMCAvRmxhZ3MgMzIKL0ZvbnRCQm94IFstOTUxIC00ODEgMTQ0NSAxMTIyXSAvRm9u - dE5hbWUgL05ER1dJSytIZWx2ZXRpY2EgL0l0YWxpY0FuZ2xlIDAKL1N0ZW1WIDAgL01h - eFdpZHRoIDE1MDAgL1hIZWlnaHQgNjM3IC9Gb250RmlsZTIgMjMxIDAgUiA+PgplbmRv - YmoKMjM0IDAgb2JqClsgMjc4IDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAg - MCAwIDAgMCAwIDAgMCAwIDAgMCAwIDU4NCAwIDU4NCAwIDAKNjY3IDAgNzIyIDAgMCAw - IDAgMCAyNzggMCAwIDU1NiA4MzMgMCAwIDY2NyAwIDAgMCAwIDAgMCAwIDAgMCAwIDAg - MCAwIDAgNTU2CjAgNTU2IDU1NiA1MDAgNTU2IDU1NiAyNzggNTU2IDU1NiAyMjIgMCA1 - MDAgMjIyIDgzMyA1NTYgNTU2IDU1NiAwIDMzMyA1MDAKMjc4IDU1NiA1MDAgNzIyIDAg - NTAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAw - IDAgMAowIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAg - MCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwCjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAw - IDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAK - NTAwIF0KZW5kb2JqCjUwIDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UcnVl - VHlwZSAvQmFzZUZvbnQgL05ER1dJSytIZWx2ZXRpY2EgL0ZvbnREZXNjcmlwdG9yCjIz - MyAwIFIgL1dpZHRocyAyMzQgMCBSIC9GaXJzdENoYXIgMzIgL0xhc3RDaGFyIDIyMiAv - RW5jb2RpbmcgL01hY1JvbWFuRW5jb2RpbmcKPj4KZW5kb2JqCjIzNSAwIG9iago8PCAv - TGVuZ3RoIDIzNiAwIFIgL0xlbmd0aDEgMTM3MDggL0ZpbHRlciAvRmxhdGVEZWNvZGUg - Pj4Kc3RyZWFtCngBvXsLeFTVtfDe5z1nZpKZSeaZx8xkZjLJ5DFJIC8IySTkBUkgBAIJ - JpIAoQFBASPPgghoIGp9tBJAWrWgIEo7BAuDFH8uRaECvSr6g0BFKyKKKZWigGHO3LXP - JCnk7+3n9/39ek7W7OfZe+211llr7bVPOhY+1IbUaBWiUe3U1vmzkHxlTUKIzpsxr3V+ - uBy1BNITMxZ12MJlNgnaH5s1/yfzwmXBj5Do/Mncpf3PR29EKM7W3tY6M9yObkOa0w4V - 4TIeDqmzfV4HGRcu3Yfws23uAzP626NLoTxpXuuS/vnReSjb7m+d1wYpXFmp8JM0/4EH - O+QiygxA2jF/YVt/f9wA+P03wlCbjOYgBZqLBEQhDdxNCPGXRSdioJW0AxSn1b84LbLg - O6QV5OF+7U5fRTLv2H9/68b5227lSkU59FPI/UkDPMMlS8kIqTC0n1OuHGwhreRKDqC6 - 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 - bkh54pDypCHl1iHl6UPKM4aUQUjuorcsw3es5ydD2tuHlGcPKc8dUpb/L+mO8chJz538 - fWBIef6Q8sIh5QeHlDuGlB8aUl40pLx4SHnJkDIccCD0P2hfgD4KZW5kc3RyZWFtCmVu - ZG9iagoyMzYgMCBvYmoKOTEwNgplbmRvYmoKMjM3IDAgb2JqCjw8IC9UeXBlIC9Gb250 - RGVzY3JpcHRvciAvQXNjZW50IDc3MCAvQ2FwSGVpZ2h0IDc0MSAvRGVzY2VudCAtMjMw - IC9GbGFncyAzMgovRm9udEJCb3ggWy0xMDE4IC00ODEgMTQzNiAxMTU5XSAvRm9udE5h - bWUgL0tPTUxTTytIZWx2ZXRpY2EtQm9sZCAvSXRhbGljQW5nbGUKMCAvU3RlbVYgMCAv - TWF4V2lkdGggMTUwMCAvWEhlaWdodCA1NDkgL0ZvbnRGaWxlMiAyMzUgMCBSID4+CmVu - ZG9iagoyMzggMCBvYmoKWyAyNzggMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMzMzIDAg - MCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgNzIyCjcyMiA3MjIgNzIy - IDY2NyA2MTEgNzc4IDcyMiAyNzggMCAwIDYxMSA4MzMgNzIyIDc3OCA2NjcgMCA3MjIg - NjY3IDYxMSAwIDAKMCAwIDAgMCAwIDAgMCAwIDAgMCA1NTYgNjExIDU1NiA2MTEgNTU2 - IDAgNjExIDYxMSAyNzggMCAwIDI3OCA4ODkgNjExIDYxMQo2MTEgMCAzODkgNTU2IDMz - MyA2MTEgNTU2IDc3OCA1NTYgNTU2IF0KZW5kb2JqCjE0IDAgb2JqCjw8IC9UeXBlIC9G - b250IC9TdWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL0tPTUxTTytIZWx2ZXRpY2Et - Qm9sZCAvRm9udERlc2NyaXB0b3IKMjM3IDAgUiAvV2lkdGhzIDIzOCAwIFIgL0ZpcnN0 - Q2hhciAzMiAvTGFzdENoYXIgMTIxIC9FbmNvZGluZyAvTWFjUm9tYW5FbmNvZGluZwo+ - PgplbmRvYmoKMjM5IDAgb2JqCihVbnRpdGxlZCkKZW5kb2JqCjI0MCAwIG9iagooTWFj - IE9TIFggMTAuNi4zIFF1YXJ0eiBQREZDb250ZXh0KQplbmRvYmoKMjQxIDAgb2JqCihX - aWxsaWFtIE90dGUpCmVuZG9iagoyNDIgMCBvYmoKKE9tbmlHcmFmZmxlIFByb2Zlc3Np - b25hbCkKZW5kb2JqCjI0MyAwIG9iagooRDoyMDEwMDcwMjAzMzgwNVowMCcwMCcpCmVu - ZG9iagoxIDAgb2JqCjw8IC9UaXRsZSAyMzkgMCBSIC9BdXRob3IgMjQxIDAgUiAvUHJv - ZHVjZXIgMjQwIDAgUiAvQ3JlYXRvciAyNDIgMCBSIC9DcmVhdGlvbkRhdGUKMjQzIDAg - UiAvTW9kRGF0ZSAyNDMgMCBSID4+CmVuZG9iagp4cmVmCjAgMjQ0CjAwMDAwMDAwMDAg - NjU1MzUgZiAKMDAwMDIwNzM3MSAwMDAwMCBuIAowMDAwMTg1NDgyIDAwMDAwIG4gCjAw - MDAwMDIyNjAgMDAwMDAgbiAKMDAwMDE4NTA4NCAwMDAwMCBuIAowMDAwMDAwMDIyIDAw - MDAwIG4gCjAwMDAwMDIyNDAgMDAwMDAgbiAKMDAwMDAwMjM2NSAwMDAwMCBuIAowMDAw - MDI3MzE0IDAwMDAwIG4gCjAwMDAwMDI1MzggMDAwMDAgbiAKMDAwMDAwNjY5OCAwMDAw - MCBuIAowMDAwMDA2NzE5IDAwMDAwIG4gCjAwMDAwMDc2MDMgMDAwMDAgbiAKMDAwMDAy - NjQxNyAwMDAwMCBuIAowMDAwMjA2OTg5IDAwMDAwIG4gCjAwMDAwMjU1NTIgMDAwMDAg - biAKMDAwMDAwNzYyMyAwMDAwMCBuIAowMDAwMDE1OTU5IDAwMDAwIG4gCjAwMDAwMTU5 - ODAgMDAwMDAgbiAKMDAwMDAxOTQ1MSAwMDAwMCBuIAowMDAwMDE5NDcyIDAwMDAwIG4g - CjAwMDAwMjU1MzEgMDAwMDAgbiAKMDAwMDAyNTU4OSAwMDAwMCBuIAowMDAwMDI2Mzk3 - IDAwMDAwIG4gCjAwMDAwMjY0NTQgMDAwMDAgbiAKMDAwMDAyNzI5NCAwMDAwMCBuIAow - MDAwMDI4ODg2IDAwMDAwIG4gCjAwMDAwMjczNTAgMDAwMDAgbiAKMDAwMDAyODg2NSAw - MDAwMCBuIAowMDAwMDI4OTk0IDAwMDAwIG4gCjAwMDAwMjkxNjkgMDAwMDAgbiAKMDAw - MDAzMjM5MyAwMDAwMCBuIAowMDAwMDMyNDE0IDAwMDAwIG4gCjAwMDAwMzk5ODMgMDAw - MDAgbiAKMDAwMDA0MjY1NyAwMDAwMCBuIAowMDAwMDQwMDA0IDAwMDAwIG4gCjAwMDAw - NDI2MzYgMDAwMDAgbiAKMDAwMDA0Mjc2NSAwMDAwMCBuIAowMDAwMDQzMzg5IDAwMDAw - IG4gCjAwMDAwNDM4NzcgMDAwMDAgbiAKMDAwMDA0MzAwMSAwMDAwMCBuIAowMDAwMDQz - MzY5IDAwMDAwIG4gCjAwMDAwNDQ2OTAgMDAwMDAgbiAKMDAwMDA0NTE2MiAwMDAwMCBu - IAowMDAwMDQzODk3IDAwMDAwIG4gCjAwMDAwNDQzMDggMDAwMDAgbiAKMDAwMDA0NDMy - OCAwMDAwMCBuIAowMDAwMDQ0NjcwIDAwMDAwIG4gCjAwMDAwNDUxODIgMDAwMDAgbiAK - MDAwMDA0NTY5MCAwMDAwMCBuIAowMDAwMTk3MDc3IDAwMDAwIG4gCjAwMDAwNDU3MTAg - MDAwMDAgbiAKMDAwMDA0ODc3MCAwMDAwMCBuIAowMDAwMDU3NTgzIDAwMDAwIG4gCjAw - MDAwNTk0MTAgMDAwMDAgbiAKMDAwMDA1MDY4MCAwMDAwMCBuIAowMDAwMDUzNTI1IDAw - MDAwIG4gCjAwMDAwNDg3OTEgMDAwMDAgbiAKMDAwMDA1MDY1OSAwMDAwMCBuIAowMDAw - MDUzNTQ2IDAwMDAwIG4gCjAwMDAwNTU1MzAgMDAwMDAgbiAKMDAwMDA1NTU1MSAwMDAw - MCBuIAowMDAwMDU3NTYyIDAwMDAwIG4gCjAwMDAwNjE4MDcgMDAwMDAgbiAKMDAwMDA1 - OTQzMSAwMDAwMCBuIAowMDAwMDYxNzg2IDAwMDAwIG4gCjAwMDAwNjE5MTUgMDAwMDAg - biAKMDAwMDA2Mjc1OCAwMDAwMCBuIAowMDAwMDYzMjkxIDAwMDAwIG4gCjAwMDAwNjIx - NTMgMDAwMDAgbiAKMDAwMDA2MjczOCAwMDAwMCBuIAowMDAwMDY1NjQxIDAwMDAwIG4g - CjAwMDAwNjc2NzUgMDAwMDAgbiAKMDAwMDA2MzMxMSAwMDAwMCBuIAowMDAwMDY1NjIw - IDAwMDAwIG4gCjAwMDAwNzA2MTggMDAwMDAgbiAKMDAwMDA2NzY5NiAwMDAwMCBuIAow - MDAwMDcwNTk3IDAwMDAwIG4gCjAwMDAwNzA3MjYgMDAwMDAgbiAKMDAwMDA3MjY0MSAw - MDAwMCBuIAowMDAwMDczMzQ3IDAwMDAwIG4gCjAwMDAwNzIwNDUgMDAwMDAgbiAKMDAw - MDA3MjYyMSAwMDAwMCBuIAowMDAwMDcwOTY3IDAwMDAwIG4gCjAwMDAwNzE2NTUgMDAw - MDAgbiAKMDAwMDA3MTY3NSAwMDAwMCBuIAowMDAwMDcyMDI1IDAwMDAwIG4gCjAwMDAw - NzY1OTEgMDAwMDAgbiAKMDAwMDA3OTg4OSAwMDAwMCBuIAowMDAwMDgzMjA1IDAwMDAw - IG4gCjAwMDAwODU5ODcgMDAwMDAgbiAKMDAwMDA3MzM2NyAwMDAwMCBuIAowMDAwMDc2 - NTcwIDAwMDAwIG4gCjAwMDAwNzk5MTAgMDAwMDAgbiAKMDAwMDA4MzE4NCAwMDAwMCBu - IAowMDAwMDg4MzU4IDAwMDAwIG4gCjAwMDAwODYwMDggMDAwMDAgbiAKMDAwMDA4ODMz - NyAwMDAwMCBuIAowMDAwMDg4NDY2IDAwMDAwIG4gCjAwMDAwODk4MjYgMDAwMDAgbiAK - MDAwMDA5MDI2OCAwMDAwMCBuIAowMDAwMDg5MTgzIDAwMDAwIG4gCjAwMDAwODk4MDUg - MDAwMDAgbiAKMDAwMDA4ODY5NyAwMDAwMCBuIAowMDAwMDg5MTYyIDAwMDAwIG4gCjAw - MDAwOTAyODkgMDAwMDAgbiAKMDAwMDA5MDY4OSAwMDAwMCBuIAowMDAwMDk2NjIyIDAw - MDAwIG4gCjAwMDAwOTg2MDAgMDAwMDAgbiAKMDAwMDA5MDcxMCAwMDAwMCBuIAowMDAw - MDkzNDUzIDAwMDAwIG4gCjAwMDAwOTg2MjIgMDAwMDAgbiAKMDAwMDEwMTc2NCAwMDAw - MCBuIAowMDAwMDkzNDc1IDAwMDAwIG4gCjAwMDAwOTY2MDAgMDAwMDAgbiAKMDAwMDEw - MzIwOCAwMDAwMCBuIAowMDAwMTAxNzg2IDAwMDAwIG4gCjAwMDAxMDMxODYgMDAwMDAg - biAKMDAwMDEwMzMxOSAwMDAwMCBuIAowMDAwMTA2OTI3IDAwMDAwIG4gCjAwMDAxMDM1 - MjAgMDAwMDAgbiAKMDAwMDEwNjkwNSAwMDAwMCBuIAowMDAwMTA3MDM4IDAwMDAwIG4g - CjAwMDAxMDk4NTggMDAwMDAgbiAKMDAwMDExMzI1NiAwMDAwMCBuIAowMDAwMTA3MjQ2 - IDAwMDAwIG4gCjAwMDAxMDg3NDggMDAwMDAgbiAKMDAwMDEwOTE0NSAwMDAwMCBuIAow - MDAwMTA5ODM3IDAwMDAwIG4gCjAwMDAxMDg3NzAgMDAwMDAgbiAKMDAwMDEwOTEyNCAw - MDAwMCBuIAowMDAwMTE5OTk5IDAwMDAwIG4gCjAwMDAxMjQ2NTEgMDAwMDAgbiAKMDAw - MDEyNzM0NCAwMDAwMCBuIAowMDAwMTI5NjA0IDAwMDAwIG4gCjAwMDAxMjQ2NzMgMDAw - MDAgbiAKMDAwMDEyNzMyMiAwMDAwMCBuIAowMDAwMTEzMjc4IDAwMDAwIG4gCjAwMDAx - MTk5NzcgMDAwMDAgbiAKMDAwMDEzMTE4MCAwMDAwMCBuIAowMDAwMTg1MjEwIDAwMDAw - IG4gCjAwMDAxMjk2MjYgMDAwMDAgbiAKMDAwMDEzMTE1OCAwMDAwMCBuIAowMDAwMTMx - MjkzIDAwMDAwIG4gCjAwMDAxMzE4OTUgMDAwMDAgbiAKMDAwMDEzMjQwOCAwMDAwMCBu - IAowMDAwMTMyODIxIDAwMDAwIG4gCjAwMDAxMzMzMTIgMDAwMDAgbiAKMDAwMDEzMTUy - NiAwMDAwMCBuIAowMDAwMTMxODc0IDAwMDAwIG4gCjAwMDAxMzI0MjkgMDAwMDAgbiAK - MDAwMDEzMjgwMCAwMDAwMCBuIAowMDAwMTM1OTE2IDAwMDAwIG4gCjAwMDAxMzc3ODkg - MDAwMDAgbiAKMDAwMDEzNzgxMSAwMDAwMCBuIAowMDAwMTM5Njg2IDAwMDAwIG4gCjAw - MDAxMzk3MDggMDAwMDAgbiAKMDAwMDE0MTYwMyAwMDAwMCBuIAowMDAwMTMzMzMzIDAw - MDAwIG4gCjAwMDAxMzU4OTQgMDAwMDAgbiAKMDAwMDE0Mjg0NSAwMDAwMCBuIAowMDAw - MTQxNjI1IDAwMDAwIG4gCjAwMDAxNDI4MjMgMDAwMDAgbiAKMDAwMDE0Mjk1OCAwMDAw - MCBuIAowMDAwMTQzMTUyIDAwMDAwIG4gCjAwMDAxNDM3NzQgMDAwMDAgbiAKMDAwMDE0 - NDQ3MCAwMDAwMCBuIAowMDAwMTQ1ODU5IDAwMDAwIG4gCjAwMDAxNDM3OTUgMDAwMDAg - biAKMDAwMDE0NDQ0OSAwMDAwMCBuIAowMDAwMTUyMjc1IDAwMDAwIG4gCjAwMDAxNTc0 - NjEgMDAwMDAgbiAKMDAwMDE0NTg4MSAwMDAwMCBuIAowMDAwMTQ4MDE5IDAwMDAwIG4g - CjAwMDAxNDgwNDEgMDAwMDAgbiAKMDAwMDE1MjI1MyAwMDAwMCBuIAowMDAwMTU4NjUy - IDAwMDAwIG4gCjAwMDAxNTc0ODMgMDAwMDAgbiAKMDAwMDE1ODYzMCAwMDAwMCBuIAow - MDAwMTU4NzY1IDAwMDAwIG4gCjAwMDAxNjMyNTEgMDAwMDAgbiAKMDAwMDE2NTIzNiAw - MDAwMCBuIAowMDAwMTU4OTg2IDAwMDAwIG4gCjAwMDAxNjExMjYgMDAwMDAgbiAKMDAw - MDE2MTE0OCAwMDAwMCBuIAowMDAwMTYzMjI5IDAwMDAwIG4gCjAwMDAxNjUyNTggMDAw - MDAgbiAKMDAwMDE2NjQzMyAwMDAwMCBuIAowMDAwMTcxMjI5IDAwMDAwIG4gCjAwMDAx - NzYwOTQgMDAwMDAgbiAKMDAwMDE2NjQ1NCAwMDAwMCBuIAowMDAwMTcxMjA3IDAwMDAw - IG4gCjAwMDAxNzYxMTYgMDAwMDAgbiAKMDAwMDE4MDg2MCAwMDAwMCBuIAowMDAwMTgw - ODgyIDAwMDAwIG4gCjAwMDAxODUwNjIgMDAwMDAgbiAKMDAwMDE4NTMwNSAwMDAwMCBu - IAowMDAwMTg1Mzk5IDAwMDAwIG4gCjAwMDAxODc1MTcgMDAwMDAgbiAKMDAwMDE4NTUz - MiAwMDAwMCBuIAowMDAwMTg3NDk0IDAwMDAwIG4gCjAwMDAxODU2NDEgMDAwMDAgbiAK - MDAwMDE4NzQ3MSAwMDAwMCBuIAowMDAwMTg3NDMyIDAwMDAwIG4gCjAwMDAxODU3NjUg - MDAwMDAgbiAKMDAwMDE4NzQwOSAwMDAwMCBuIAowMDAwMTg3MzcwIDAwMDAwIG4gCjAw - MDAxODU4ODkgMDAwMDAgbiAKMDAwMDE4NzM0NyAwMDAwMCBuIAowMDAwMTg3MzA4IDAw - MDAwIG4gCjAwMDAxODYwMTMgMDAwMDAgbiAKMDAwMDE4NzI4NSAwMDAwMCBuIAowMDAw - MTg3MjQ2IDAwMDAwIG4gCjAwMDAxODYxMzggMDAwMDAgbiAKMDAwMDE4NzIyMyAwMDAw - MCBuIAowMDAwMTg3MTg0IDAwMDAwIG4gCjAwMDAxODYyNjIgMDAwMDAgbiAKMDAwMDE4 - NzE2MSAwMDAwMCBuIAowMDAwMTg3MTIyIDAwMDAwIG4gCjAwMDAxODYzODcgMDAwMDAg - biAKMDAwMDE4NzA5OSAwMDAwMCBuIAowMDAwMTg3MDYwIDAwMDAwIG4gCjAwMDAxODY1 - MTMgMDAwMDAgbiAKMDAwMDE4NzAzNyAwMDAwMCBuIAowMDAwMTg2OTk4IDAwMDAwIG4g - CjAwMDAxODY2MzggMDAwMDAgbiAKMDAwMDE4Njk3NSAwMDAwMCBuIAowMDAwMTg2OTM2 - IDAwMDAwIG4gCjAwMDAxODY3NjMgMDAwMDAgbiAKMDAwMDE4NjkxMyAwMDAwMCBuIAow - MDAwMTg2ODc0IDAwMDAwIG4gCjAwMDAxODc2MjggMDAwMDAgbiAKMDAwMDE5NjM1OSAw - MDAwMCBuIAowMDAwMTk2MzgxIDAwMDAwIG4gCjAwMDAxOTY2MDggMDAwMDAgbiAKMDAw - MDE5NzI1NCAwMDAwMCBuIAowMDAwMjA2NDUzIDAwMDAwIG4gCjAwMDAyMDY0NzUgMDAw - MDAgbiAKMDAwMDIwNjcwOCAwMDAwMCBuIAowMDAwMjA3MTcxIDAwMDAwIG4gCjAwMDAy - MDcxOTkgMDAwMDAgbiAKMDAwMDIwNzI1MiAwMDAwMCBuIAowMDAwMjA3Mjg0IDAwMDAw - IG4gCjAwMDAyMDczMjggMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSAyNDQgL1Jvb3Qg - MTk3IDAgUiAvSW5mbyAxIDAgUiAvSUQgWyA8NzEwN2ZmOTMyMTgyNDUxNTZiNTA3NTg3 - ZDA0ZjIzMDE+Cjw3MTA3ZmY5MzIxODI0NTE1NmI1MDc1ODdkMDRmMjMwMT4gXSA+Pgpz - dGFydHhyZWYKMjA3NDk3CiUlRU9GCjMgMCBvYmoKPDwvVHlwZSAvUGFnZSAvQ29udGVu - dHMgNSAwIFIgL01lZGlhQm94IFswIDAgNTc2IDczM10gL1BhcmVudCA0IDAgUiAvUmVz - b3VyY2VzIDcgMCBSID4+CmVuZG9iagoyNiAwIG9iago8PC9UeXBlIC9QYWdlIC9Db250 - ZW50cyAyNyAwIFIgL01lZGlhQm94IFswIDAgNTc2IDczM10gL1BhcmVudCA0IDAgUiAv - UmVzb3VyY2VzIDI5IDAgUiA+PgplbmRvYmoKMzQgMCBvYmoKPDwvVHlwZSAvUGFnZSAv - Q29udGVudHMgMzUgMCBSIC9NZWRpYUJveCBbMCAwIDU3NiA3MzNdIC9QYXJlbnQgNCAw - IFIgL1Jlc291cmNlcyAzNyAwIFIgPj4KZW5kb2JqCjYzIDAgb2JqCjw8L1R5cGUgL1Bh - Z2UgL0NvbnRlbnRzIDY0IDAgUiAvTWVkaWFCb3ggWzAgMCAxMTUyIDczM10gL1BhcmVu - dCA0IDAgUiAvUmVzb3VyY2VzIDY2IDAgUiA+PgplbmRvYmoKNzUgMCBvYmoKPDwvVHlw - ZSAvUGFnZSAvQ29udGVudHMgNzYgMCBSIC9NZWRpYUJveCBbMCAwIDU3NiA3MzNdIC9Q - YXJlbnQgNCAwIFIgL1Jlc291cmNlcyA3OCAwIFIgPj4KZW5kb2JqCjk1IDAgb2JqCjw8 - L1R5cGUgL1BhZ2UgL0NvbnRlbnRzIDk2IDAgUiAvTWVkaWFCb3ggWzAgMCA1NzYgNzMz - XSAvUGFyZW50IDQgMCBSIC9SZXNvdXJjZXMgOTggMCBSID4+CmVuZG9iagoxMTUgMCBv - YmoKPDwvVHlwZSAvUGFnZSAvQ29udGVudHMgMTE2IDAgUiAvTWVkaWFCb3ggWzAgMCA1 - NzYgNzMzXSAvUGFyZW50IDQgMCBSIC9SZXNvdXJjZXMgMTE4IDAgUiA+PgplbmRvYmoK - MTE5IDAgb2JqCjw8L1R5cGUgL1BhZ2UgL0NvbnRlbnRzIDEyMCAwIFIgL01lZGlhQm94 - IFswIDAgNTc2IDczM10gL1BhcmVudCA0IDAgUiAvUmVzb3VyY2VzIDEyMiAwIFIgPj4K - ZW5kb2JqCjEzOSAwIG9iago8PC9UeXBlIC9QYWdlIC9Db250ZW50cyAxNDEgMCBSIC9N - ZWRpYUJveCBbMCAwIDU3NiA3MzNdIC9QYXJlbnQgMTQwIDAgUiAvUmVzb3VyY2VzIDE0 - MyAwIFIgPj4KZW5kb2JqCjE2MCAwIG9iago8PC9UeXBlIC9QYWdlIC9Db250ZW50cyAx - NjEgMCBSIC9NZWRpYUJveCBbMCAwIDU3NiA3MzNdIC9QYXJlbnQgMTQwIDAgUiAvUmVz - b3VyY2VzIDE2MyAwIFIgPj4KZW5kb2JqCjE3NiAwIG9iago8PC9UeXBlIC9QYWdlIC9D - b250ZW50cyAxNzcgMCBSIC9NZWRpYUJveCBbMCAwIDU3NiA3MzNdIC9QYXJlbnQgMTQw - IDAgUiAvUmVzb3VyY2VzIDE3OSAwIFIgPj4KZW5kb2JqCjEgMCBvYmoKPDwvQXV0aG9y - IChXaWxsaWFtIE90dGUpL0NyZWF0aW9uRGF0ZSAoRDoyMDEwMDMxNzEyNDQwMFopL0Ny - ZWF0b3IgKE9tbmlHcmFmZmxlIFByb2Zlc3Npb25hbCA1LjIpL01vZERhdGUgKEQ6MjAx - MDA3MDEyMzI4MDBaKS9Qcm9kdWNlciAyNDAgMCBSIC9UaXRsZSAoTG9jYWxpdHlNYW5h - Z2VyKT4+CmVuZG9iagp4cmVmCjEgMQowMDAwMjEzNzI0IDAwMDAwIG4gCjMgMQowMDAw - MjEyNTM5IDAwMDAwIG4gCjI2IDEKMDAwMDIxMjY0MiAwMDAwMCBuIAozNCAxCjAwMDAy - MTI3NDggMDAwMDAgbiAKNjMgMQowMDAwMjEyODU0IDAwMDAwIG4gCjc1IDEKMDAwMDIx - Mjk2MSAwMDAwMCBuIAo5NSAxCjAwMDAyMTMwNjcgMDAwMDAgbiAKMTE1IDEKMDAwMDIx - MzE3MyAwMDAwMCBuIAoxMTkgMQowMDAwMjEzMjgyIDAwMDAwIG4gCjEzOSAxCjAwMDAy - MTMzOTEgMDAwMDAgbiAKMTYwIDEKMDAwMDIxMzUwMiAwMDAwMCBuIAoxNzYgMQowMDAw - MjEzNjEzIDAwMDAwIG4gCnRyYWlsZXIKPDwvSUQgWzw3MTA3ZmY5MzIxODI0NTE1NmI1 - MDc1ODdkMDRmMjMwMT4gPDcxMDdmZjkzMjE4MjQ1MTU2YjUwNzU4N2QwNGYyMzAxPl0g - L0luZm8gMSAwIFIgL1ByZXYgMjA3NDk3IC9Sb290IDE5NyAwIFIgL1NpemUgMjQ0Pj4K - c3RhcnR4cmVmCjIxMzkwOAolJUVPRgo= - </data> - <key>QuickLookThumbnail</key> - <data> - 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 - AAIia29LUgAAAAwAAAI2AEsAbABlAHUAcgBlAG4ALQBMAEMARABMAEMARAAtAGYAYQBy - AHYAZQBzAGsA5gByAG0ASwBvAGwAbwByACAATABDAEQAQwBvAGwAbwByACAATABDAEQA - RgBhAHIAZwBlAC0ATABDAEQATABDAEQAIABjAG8AdQBsAGUAdQByAEwAQwBEACAAQwBv - AGwAbwByAGkAZABvAEwAQwBEACAAYQAgAEMAbwByAGUAc19pgnIAIABMAEMARABMAEMA - RAAgAGMAbwBsAG8AcjCrMOkw/AAgAEwAQwBEBCYEMgQ1BEIEPQQ+BDkAIAQWBBoALQQ0 - BDgEQQQ/BDsENQQ5AEYA5AByAGcALQBMAEMARF9pgnJtsmZ2mG95OlZoAEYAYQByAGIA - LQBMAEMARABWAOQAcgBpAC0ATABDAEQATABDAEQAIABjAG8AbABvAHIAac7st+wAIABM - AEMARAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUsIEluYy4sIDIwMTAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAFhZWiAAAAAAAADzUgABAAAAARbPWFlaIAAAAAAAAF7hAAA1SQAABORY - WVogAAAAAAAAb4MAALGJAAAem1hZWiAAAAAAAAAocQAAGS4AAK+uY3VydgAAAAAAAAQA - AAAABQAKAA8AFAAZAB4AIwAoAC0AMgA2ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcA - fACBAIYAiwCQAJUAmgCfAKMAqACtALIAtwC8AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7 - AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEB - qQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKE - Ao4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YD - ogOuA7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTw - BP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsG - jAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRgha - CG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicKPQpUCmoK - gQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZ - DPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oP - lg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKE - EqMSwxLjEwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V - 4BYDFiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlr - GZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcd - cB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEgbCCYIMQg8CEcIUghdSGh - Ic4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVoJZclxyX3Jicm - VyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 - K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGww - pDDbMRIxSjGCMbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3 - NnI2rjbpNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8 - ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHuQjBCckK1 - QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJ - qUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/dUCdQcVC7 - UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9Y - fVjLWRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBX - YKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo - 7GlDaZpp8WpIap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGV - cfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pGeqV7 - BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC9INXg7qEHYSA - hOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/jmaO - zo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkk - mZCZ/JpomtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+ak - VqTHpTilqaYapoum/adup+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+L - sACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67 - p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/ - yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnU - y9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM - 4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070Dv - zPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26 - /kv+3P9t//9wYXJhAAAAAAADAAAAAmZmAADypwAADVkAABPQAAAKwHZjZ3QAAAAAAAAA - AAADAQAAAgAAAAIACAAUACUAPABaAH4AqQDbARwBcwHVAkcCyQNiBBAEywWfBosHlQi0 - CegLLwyADeQPWhDLEjYTpxUPFm0Xuhj5Gi8bTxxfHV4eUx9IIDwhLiIgIxUkCyUHJgAm - +SfyKO4p5irlK+Es2C3TLtAvyzDFMb8ytzOwNKs1pjagN5k4lDmNOn87ZTw/PRk98j7J - P6NAgUFgQjtDHEP8RN5Fv0ahR4ZIbUlUSjtLIkwITPJN3E7FT65QmFGEUnJTZFRYVVJW - S1dEWDxZNFotWydcIF0aXhdfFWASYRBiEmMUZBdlG2YiZypoNmlAakxrWWxZbUpuNm8j - cBJw/3Hsctlzx3S0dZ92jnd5eGR5UXo7eyZ8Dnz4feF+yn+0gJyBhIJ4g5WEv4XnhxKI - P4ltip2Ly4z8jjKPZZCfkdaTDZRGlYKWv5f7mTmaeZu6nPeeMp9XoGyhhKKeo7OkzKXk - pvuoFKkvqkyraayEraKuwa/jsQOyJ7NKtGy1j7azt9W47bn/uxK8I703vkq/W8BrwXzC - isOUxKLFq8awx7XIt8m3yrbLtMyyza3Oo8+W0IbRc9Je00jUMdUW1fvW4NfB2KLZg9pj - 20TcJN0E3ejeyt+w4JXhfOJl403kMOUS5fLm1Oe36KDpkuqM65XsrO3a7x7wgfIN88b1 - v/f7+qL9yv//AAAAAgAJABUAJwBAAGAAhgC0AOoBKQFzAcUCIwKUAxADpARKBQcF3gbR - B9YI/Qo4C5ANAQ56D/oRhxMQFIUV+RdYGJkZ0xr0HAcdCh36Huof3SDMIbsirSOgJJgl - kiaHJ30ocilnKmArWSxNLUUuPy80MCcxHzIRMwMz+DTtNeE21DfHOLo5pjqFO1c8Kzz9 - Pc8+oz96QFJBKEIDQt5DukSXRXRGVkc3SBpI/UnfSsJLp0yPTXROWk9BUChRE1H9UuxT - 3VTQVcFWs1ekWJdZilp+W3FcaF1jXltfVGBTYVNiUWNUZFllX2ZpZ3NofWmKaopreWxk - bU9uPW8ocBZxAnHucttzxnSydZ52iHd3eF95S3o0ex58B3zxfdx+xX+vgKOBtILRg+6F - DoYwh1OIeImdisWL8o0fjlCPgZC1kemTIZRblZaW05gSmVOaj5vQnPyeHp9FoGyhkKK3 - o96lA6Yrp1WogamuqtmsB603rmqvmrDRsgezOrRwtae237gRuT+6a7uXvMS98L8awELB - bcKUw7jE4cYFxyjIS8luypDLsszVzfrPHdA10T3SPtM+1DzVPNY71zfYNNkw2irbItwb - 3RHeBd763+rg3eHL4rzjquSX5abm1Of96STqUOt77KPtz+788DDxafKj8+X1MvaF9975 - RPqw/CH9lv8M//8AAAABAAYADwAcAC4ARQBhAIIAqADUAQYBTgGeAfUCYALVA14D+ASp - BW0GRgc5CEAJVQp8C60M6g4kD1YQiBGuEsgTzxTJFbcWkxdfGCQY5BmnGmkbKBvrHK8d - dh4+HwMfxyCLIU8iFiLaI5wkXyUjJeQmpCdiKB4o2imXKlQrDyvILIEtOi3xLpgvOS/a - MHoxGjG6Mlsy/TOeNEE04jWENic2yTdsOA84sTlVOfc6mTs9O988gj0lPcg+bT8UP8FA - c0ErQeJCmkNSRAlEwUV7RjZG8UevSG9JLUntSrFLd0w6TQJNzE6XT2RQMVEAUc9Sm1Nj - VCpU71W2Vn5XRlgMWNRZnFpiWyxb9Fy9XYheUl8fX+pgtmGFYlRjJGP0ZMVllWZhZy9n - /GjJaZhqZ2s2bANs0m2jbnNvRXAWcOVxtnKIc1p0LHUAddR2qHd6eFJ5MnoXewN78Xze - fc9+wn+1gK2BqYKog6qErIWyhruHxojRieGK8owAjRCOIY80kEiRXJJwk4aUopXBluKY - BZkvmlubiZzAnfmfM6BzobWi+aRBpYum2agnqXWqzKwlrX2u1bAvsYuy5bRBtaC2/rhe - ucC7IryEvem/S8C0whnDgsToxk/HvMkpyobL4804zovP5dFD0rDUK9W011jZHdsE3SDf - euIm5T3pA+359aD//wAAbmRpbgAAAAAAAAY2AACbsgAAWOIAAFOcAACNlwAAKH8AABcK - AABQDQAAVDkAAeZmAAHj1wABNcIAAwEAAAIAAAAxAFUAdgCTALAAywDlAP0BFgEuAUYB - XwF3AZABqAHCAdwB+AIUAjECUAJwApICtwLeAwcDNANlA5sD1gQTBFIElATYBR0FZAWr - BfUGQQaPBt4HMQeCB9gIMQiKCOUJQwmjCgUKawrRCzkLowwRDH8M8A1lDeMObQ75D4kQ - HRCwEUQR3hJ2ExITrxRQFPEVkxY4Ft8XiRg2GOIZkhpFGvobsBxnHR4d1R6KH0If/SC6 - IXoiPCL/I8UkjSVUJh0m6ie3KIMpUiojKvQrxSyYLWouQC8WL+0w0zHKMsczxzTFNcs2 - 0TfbOOY5+TsIPCA9Oj5UP3VAl0HBQulEGEVGRntHskjdSd5K1kvTTM9Nyk7HT8VQw1HD - UsdTxFTFVclWyFfMWNFZ11reW+Rc6130Xv5gCGETYh5jL2Q/ZVhmj2fRaQ5qTGuSbNVu - G29mcLBx+XNEdI513HcteHx5zXscfHF9wn8TgGuBxIMehHiF1YdAiLqKL4uwjSuOqZAr - kbOTPZTHllqX9JmKmyuc1Z6AoDOh66OppWqnL6j8qtasuK6jsJiylbSRtp+4sbrGvOi/ - C8E1w2PFkcfJyffMLs5c0JPSx9Tz1zfZgdvT3ibgduK45OXnBej96unsrO5d7/TxbvLK - 9BP1TPZn93j4fPln+kf7F/ve/Jz9RP3s/tz//wAAAC4AWQB/AKEAwADdAPgBEwEsAUUB - XgF1AY0BpQG+AdcB8AIKAiUCQgJgAn8CoALFAu0DFgNFA3cDrgPrBCoEagSuBPMFOgWC - BcoGFgZkBrQHBwdaB68ICAhiCL0JHAl+CeAKRwqwCxoLhgv1DGcM2g1RDdAOXw7vD4MQ - GxCyEUsR6RKFEyUTxhRrFQ8VtRZdFwgXthhmGRUZyRp/Gzcb8RyrHWgeIx7fH50gXyEj - IekisSN6JEclEyXeJq4nfyhOKR4p8irEK5csay0+LhQu6y/BMKMxmjKYM5k0mDWfNqQ3 - sDi7Oc063zv1PRA+KD9KQGpBk0K6Q+lFFEZHR31IrEm8Sr9LxkzMTdFO10/eUOZR71L5 - U/9VB1YQVxZYIFkoWjRbPVxGXVBeW19mYHFhfGKIY5tkp2XFZvdoKGlTaoVru2zubiRv - X3CZcdFzC3RFdYB2v3f8eTp6eHu1fPh+NH9ygLeB/INBhIWFy4cXiG2JwYsejHqN1o82 - kJiSApNqlNOWRJe5mSqaoZwenZyfHKCfoiWjrKU0pr2oRqnbq4utUq8esO6yxLSUtnK4 - U7o0vB2+Dr/9wffD+MX6yArKFswwzkXQaNKM1FXWA9fA2YPbP9z+3r/gi+JL5BDlzueE - 6T/q9Oyh7kTv4/F/8xb0ofYp97D5M/qx/DX9q///AAAAQABxAJwAwgDlAQYBJQFDAWEB - fwGcAbsB2QH5AhsCPgJjAosCtgLmAxoDUwOVA98ELQR9BNMFKgWDBd4GPgahBwgHcQfe - CFAIxAk9CbsKPwrGC1AL4Ax1DQ4NrQ5nDyUP6xC0EYISVBMsFAgU6hXQFrsXrRijGZ4a - oBulHKodpx6dH5gglyGaIqAjpySyJbomySfYKOQp9ysHLBktKi4/L1QwbjGVMsIz9DUm - Nl03mjjWOhw7XTyoPe8/PkCKQd9DL0SERdpHM0iOSfZLXkzNTjtPrVEjUqBUGFWXVxVY - m1olW65dO17LYFxh72OLZR5mo2gjaZhrFWyQbghvg3D6cm1z33VNdsB4Lnmcewd8dn3h - f0qAu4Itg5+FEYaCh/aJbYrkjFuNzY8+kK2SH5OJlPGWWpfCmSKagpvknUOen5/7oVei - sqQMpWWmvagUqXOqy6wfrXOuybAhsXqy1bQqtYW247hAuZy697xWvbe/EsBywdLDNMSW - xfXHXsi/yiDLh8zuzlHPvNEm0pDT9NVZ1svYTNnH207c1N5k3+fhbOLp5FrlxOcn6IHp - zesL7DvtYe5+74bwh/GE8mjzRfQW9OL1ofZU9wj3pfhB+Nz5Xfne+l/6z/sy+5X7+Pxb - /J/83/0f/WD9oP3g/iH+WP6N/sL+9/8s/2D/lf/K//8AAHNmMzIAAAAAAAEMQgAABd7/ - //MmAAAHkgAA/ZH///ui///9owAAA9wAAMBsbW1vZAAAAAAAAAYQAACcggAAAADCrfCA - AAAAAAAAAAAAAAAAAAAAAA== - </data> <key>ReadOnly</key> <string>NO</string> <key>Sheets</key> @@ -4555,10 +152,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 NodeApplication Implementation}</string> <key>VerticalPad</key> @@ -4601,10 +198,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 CIAO Teardown Logic}</string> </dict> @@ -4643,10 +240,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 CIAO Local Facet Connection Logic}</string> </dict> @@ -4685,10 +282,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 CCM Component Connection Logic}</string> </dict> @@ -4727,10 +324,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 CCM Component Installation Logic}</string> </dict> @@ -4769,10 +366,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 CCM Home Installation Logic}</string> </dict> @@ -4811,10 +408,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Component Server Launching Logic}</string> </dict> @@ -4853,10 +450,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Locality processing logic}</string> </dict> @@ -4968,14 +565,6 @@ <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -5034,10 +623,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Locality Manager}</string> <key>VerticalPad</key> @@ -5078,10 +667,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Instance Run-Time Environment}</string> </dict> @@ -5118,10 +707,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Instance Teardown Logic}</string> </dict> @@ -5158,10 +747,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Instance Connection Logic}</string> </dict> @@ -5198,10 +787,10 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Instance Installation Logic}</string> </dict> @@ -5301,14 +890,6 @@ <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -5333,7 +914,7 @@ <array> <dict> <key>Bounds</key> - <string>{{97.5557, 341.455}, {125, 14}}</string> + <string>{{97.555702, 341.45499}, {125, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -5380,10 +961,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 Connection Information}</string> <key>VerticalPad</key> @@ -5428,8 +1009,8 @@ <integer>63</integer> <key>Points</key> <array> - <string>{254.442, 356.779}</string> - <string>{383.442, 355.889}</string> + <string>{254.442, 356.77899}</string> + <string>{383.44199, 355.88901}</string> </array> <key>Style</key> <dict> @@ -5457,7 +1038,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{266.399, 331.128}, {112, 14}}</string> + <string>{{266.39899, 331.12799}, {112, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -5504,10 +1085,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 post_install_instance}</string> <key>VerticalPad</key> @@ -5526,7 +1107,7 @@ <key>Points</key> <array> <string>{254.442, 309.5}</string> - <string>{383.442, 309.545}</string> + <string>{383.44199, 309.54501}</string> </array> <key>Style</key> <dict> @@ -5554,7 +1135,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{281.031, 284.342}, {83, 14}}</string> + <string>{{281.03101, 284.34201}, {83, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -5601,10 +1182,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 install_instance}</string> <key>VerticalPad</key> @@ -5622,8 +1203,8 @@ <integer>59</integer> <key>Points</key> <array> - <string>{254.394, 274.626}</string> - <string>{383.394, 274.671}</string> + <string>{254.394, 274.62601}</string> + <string>{383.39401, 274.67099}</string> </array> <key>Style</key> <dict> @@ -5651,7 +1232,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{268.982, 249.468}, {107, 14}}</string> + <string>{{268.98199, 249.468}, {107, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -5698,10 +1279,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 pre_install_instance}</string> <key>VerticalPad</key> @@ -5752,7 +1333,7 @@ <key>Points</key> <array> <string>{256, 233.995}</string> - <string>{381.788, 234}</string> + <string>{381.78799, 234}</string> </array> <key>Style</key> <dict> @@ -5839,7 +1420,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{274.387, 208.816}, {96, 14}}</string> + <string>{{274.38699, 208.81599}, {96, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -5886,10 +1467,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 pre_process_plan}</string> <key>VerticalPad</key> @@ -5947,10 +1528,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 startLaunch}</string> <key>VerticalPad</key> @@ -6035,10 +1616,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 preparePlan}</string> <key>VerticalPad</key> @@ -6049,7 +1630,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{77.5, 200.455}, {17, 59.5455}}</string> + <string>{{77.5, 200.455}, {17, 59.545502}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -6081,7 +1662,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{95.7516, 150.272}, {125, 14}}</string> + <string>{{95.751602, 150.272}, {125, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -6128,10 +1709,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 configuration_complete}</string> <key>VerticalPad</key> @@ -6149,8 +1730,8 @@ <integer>45</integer> <key>Points</key> <array> - <string>{239, 175.454}</string> - <string>{86, 175.454}</string> + <string>{239, 175.45399}</string> + <string>{86, 175.45399}</string> </array> <key>Style</key> <dict> @@ -6169,7 +1750,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{136.252, 93.5452}, {44, 14}}</string> + <string>{{136.252, 93.545197}, {44, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -6216,10 +1797,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 callback}</string> <key>VerticalPad</key> @@ -6257,7 +1838,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{260.562, 123.748}, {115, 14}}</string> + <string>{{260.56201, 123.748}, {115, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -6304,10 +1885,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 Configuration Plugins}</string> <key>VerticalPad</key> @@ -6326,7 +1907,7 @@ <key>Points</key> <array> <string>{256, 148.864}</string> - <string>{383.442, 149}</string> + <string>{383.44199, 149}</string> </array> <key>Style</key> <dict> @@ -6441,7 +2022,7 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -6457,7 +2038,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{114.861, 64.6363}, {63, 14}}</string> + <string>{{114.861, 64.636299}, {63, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -6504,10 +2085,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 <<spawn>>}</string> <key>VerticalPad</key> @@ -6525,8 +2106,8 @@ <integer>5</integer> <key>Points</key> <array> - <string>{91, 86.1818}</string> - <string>{193.5, 86.1818}</string> + <string>{91, 86.181801}</string> + <string>{193.5, 86.181801}</string> </array> <key>Style</key> <dict> @@ -6579,10 +2160,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\fs24 \cf0 Process Localities}</string> <key>VerticalPad</key> @@ -6593,7 +2174,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{77.5, 49}, {17, 38.1818}}</string> + <string>{{77.5, 49}, {17, 38.181801}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -6676,7 +2257,7 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -6755,14 +2336,6 @@ <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -6866,10 +2439,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 startLaunch}</string> <key>VerticalPad</key> @@ -6920,7 +2493,7 @@ <integer>70</integer> <key>Points</key> <array> - <string>{366.22, 47.4096}</string> + <string>{366.22, 47.409592}</string> <string>{366.22, 198.91}</string> </array> <key>Style</key> @@ -6947,7 +2520,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{312.22, 18.9096}, {108, 28}}</string> + <string>{{312.22, 18.909599}, {108, 28}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -6963,7 +2536,7 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -6979,7 +2552,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{85, 68.91}, {17, 59.5455}}</string> + <string>{{85, 68.910004}, {17, 59.545502}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -7011,7 +2584,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{278.04, 209.91}, {125, 14}}</string> + <string>{{278.04001, 209.91}, {125, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -7058,10 +2631,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 Connection Information}</string> <key>VerticalPad</key> @@ -7113,8 +2686,8 @@ <integer>63</integer> <key>Points</key> <array> - <string>{507.442, 224.234}</string> - <string>{636.442, 223.344}</string> + <string>{507.44199, 224.23399}</string> + <string>{636.44202, 223.34399}</string> </array> <key>Style</key> <dict> @@ -7142,7 +2715,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{519.399, 198.583}, {112, 14}}</string> + <string>{{519.39899, 198.58299}, {112, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -7189,10 +2762,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 post_install_instance}</string> <key>VerticalPad</key> @@ -7210,8 +2783,8 @@ <integer>61</integer> <key>Points</key> <array> - <string>{507.442, 176.955}</string> - <string>{636.442, 177}</string> + <string>{507.44199, 176.955}</string> + <string>{636.44202, 177}</string> </array> <key>Style</key> <dict> @@ -7239,7 +2812,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{534.03, 151.797}, {83, 14}}</string> + <string>{{534.03003, 151.797}, {83, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -7286,10 +2859,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 install_instance}</string> <key>VerticalPad</key> @@ -7307,8 +2880,8 @@ <integer>59</integer> <key>Points</key> <array> - <string>{507.394, 142.081}</string> - <string>{636.394, 142.126}</string> + <string>{507.39401, 142.08099}</string> + <string>{636.39398, 142.12601}</string> </array> <key>Style</key> <dict> @@ -7336,7 +2909,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{521.982, 116.923}, {107, 14}}</string> + <string>{{521.98199, 116.923}, {107, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -7383,10 +2956,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 pre_install_instance}</string> <key>VerticalPad</key> @@ -7437,7 +3010,7 @@ <key>Points</key> <array> <string>{373.5, 102.45}</string> - <string>{628.982, 102}</string> + <string>{628.98199, 102}</string> </array> <key>Style</key> <dict> @@ -7472,8 +3045,8 @@ <integer>48</integer> <key>Points</key> <array> - <string>{96, 90.455}</string> - <string>{240.5, 90.455}</string> + <string>{96, 90.455002}</string> + <string>{240.5, 90.455002}</string> </array> <key>Style</key> <dict> @@ -7492,7 +3065,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{240.5, 83.252}, {17, 27}}</string> + <string>{{240.5, 83.251999}, {17, 27}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -7524,7 +3097,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{520.305, 76.925}, {96, 14}}</string> + <string>{{520.30499, 76.925003}, {96, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -7571,10 +3144,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 pre_process_plan}</string> <key>VerticalPad</key> @@ -7585,7 +3158,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{370.506, 101.91}, {63, 14}}</string> + <string>{{370.50555, 101.90955}, {63, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -7632,10 +3205,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 startLaunch}</string> <key>VerticalPad</key> @@ -7662,7 +3235,7 @@ <array> <string>{368, 123.455}</string> <string>{402, 123.455}</string> - <string>{491.5, 123.455}</string> + <string>{491.5, 123.45501}</string> </array> <key>Style</key> <dict> @@ -7681,7 +3254,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{141.045, 68.9096}, {66, 14}}</string> + <string>{{141.045, 68.909599}, {66, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -7728,10 +3301,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 preparePlan}</string> <key>VerticalPad</key> @@ -7754,7 +3327,7 @@ <integer>36</integer> <key>Points</key> <array> - <string>{247.5, 34.955}</string> + <string>{247.5, 34.955002}</string> <string>{247.5, 200.455}</string> </array> <key>Style</key> @@ -7797,7 +3370,7 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -7825,7 +3398,7 @@ <integer>33</integer> <key>Points</key> <array> - <string>{92, 37.4439}</string> + <string>{92, 37.443893}</string> <string>{92, 232.455}</string> </array> <key>Style</key> @@ -7852,7 +3425,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{32, 20.455}, {120, 16.4889}}</string> + <string>{{32, 20.455}, {120, 16.488899}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -7864,7 +3437,7 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -7892,7 +3465,7 @@ <integer>67</integer> <key>Points</key> <array> - <string>{498, 34.955}</string> + <string>{498, 34.955002}</string> <string>{498, 200.455}</string> </array> <key>Style</key> @@ -7935,7 +3508,7 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -8014,14 +3587,6 @@ <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -8046,7 +3611,7 @@ <array> <dict> <key>Bounds</key> - <string>{{22.2789, 268.265}, {85, 14}}</string> + <string>{{22.2789, 268.26501}, {85, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -8093,10 +3658,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 Connection Info}</string> <key>VerticalPad</key> @@ -8114,7 +3679,7 @@ <integer>92</integer> <key>Points</key> <array> - <string>{109.68, 289.588}</string> + <string>{109.68, 289.58801}</string> <string>{26.68, 290}</string> </array> <key>Style</key> @@ -8141,8 +3706,8 @@ <integer>91</integer> <key>Points</key> <array> - <string>{376.227, 259.183}</string> - <string>{496.779, 259.039}</string> + <string>{376.22699, 259.18301}</string> + <string>{496.77899, 259.039}</string> </array> <key>Style</key> <dict> @@ -8170,7 +3735,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{381.32, 233.915}, {133, 14}}</string> + <string>{{381.32001, 233.91499}, {133, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -8217,10 +3782,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 post_endpoint_reference}</string> <key>VerticalPad</key> @@ -8238,8 +3803,8 @@ <integer>89</integer> <key>Points</key> <array> - <string>{372.167, 232.474}</string> - <string>{492.719, 231.519}</string> + <string>{372.16699, 232.474}</string> + <string>{492.71899, 231.519}</string> </array> <key>Style</key> <dict> @@ -8314,10 +3879,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 provide_endpoint_reference}</string> <key>VerticalPad</key> @@ -8375,10 +3940,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 Connection Info}</string> <key>VerticalPad</key> @@ -8396,7 +3961,7 @@ <integer>86</integer> <key>Points</key> <array> - <string>{230.12, 278.588}</string> + <string>{230.12, 278.58801}</string> <string>{134.12, 279}</string> </array> <key>Style</key> @@ -8463,10 +4028,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 Connection Info}</string> <key>VerticalPad</key> @@ -8484,7 +4049,7 @@ <integer>84</integer> <key>Points</key> <array> - <string>{355.634, 263.268}</string> + <string>{355.634, 263.26801}</string> <string>{249.134, 263}</string> </array> <key>Style</key> @@ -8583,10 +4148,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 preparePlan}</string> <key>VerticalPad</key> @@ -8605,8 +4170,8 @@ <key>Points</key> <array> <string>{249.06, 94}</string> - <string>{266.06, 94.342}</string> - <string>{355.56, 94.342}</string> + <string>{266.06, 94.342003}</string> + <string>{355.56, 94.342003}</string> </array> <key>Style</key> <dict> @@ -8625,7 +4190,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{29.3539, 78.5809}, {63, 14}}</string> + <string>{{29.353901, 78.580902}, {63, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -8672,10 +4237,10 @@ <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 startLaunch}</string> <key>VerticalPad</key> @@ -8694,7 +4259,7 @@ <key>Points</key> <array> <string>{23, 100.126}</string> - <string>{45.8502, 100.126}</string> + <string>{45.850201, 100.126}</string> <string>{106, 100.126}</string> </array> <key>Style</key> @@ -8714,7 +4279,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{111.62, 94.342}, {17, 195.658}}</string> + <string>{{111.62, 94.342003}, {17, 195.658}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -8785,7 +4350,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{66.12, 44}, {108, 28}}</string> + <string>{{66.120003, 44}, {108, 28}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -8814,7 +4379,7 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -8838,8 +4403,8 @@ Manager}</string> <integer>63</integer> <key>Points</key> <array> - <string>{370.626, 204.144}</string> - <string>{491.178, 204}</string> + <string>{370.62601, 204.144}</string> + <string>{491.17801, 204}</string> </array> <key>Style</key> <dict> @@ -8914,10 +4479,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 post_install_instance}</string> <key>VerticalPad</key> @@ -8935,8 +4500,8 @@ Manager}</string> <integer>61</integer> <key>Points</key> <array> - <string>{373.182, 175.045}</string> - <string>{493.734, 174.09}</string> + <string>{373.18201, 175.045}</string> + <string>{493.73401, 174.09}</string> </array> <key>Style</key> <dict> @@ -8964,7 +4529,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{395.003, 149.361}, {83, 14}}</string> + <string>{{395.00299, 149.36099}, {83, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -9011,10 +4576,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 install_instance}</string> <key>VerticalPad</key> @@ -9032,8 +4597,8 @@ Manager}</string> <integer>59</integer> <key>Points</key> <array> - <string>{373.134, 140.171}</string> - <string>{494.722, 140.09}</string> + <string>{373.134, 140.17101}</string> + <string>{494.72198, 140.09}</string> </array> <key>Style</key> <dict> @@ -9061,7 +4626,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{386.734, 114.944}, {107, 14}}</string> + <string>{{386.73401, 114.944}, {107, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -9108,10 +4673,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 pre_install_instance}</string> <key>VerticalPad</key> @@ -9161,8 +4726,8 @@ Manager}</string> <integer>54</integer> <key>Points</key> <array> - <string>{373.708, 100.126}</string> - <string>{491.178, 101.126}</string> + <string>{373.70801, 100.126}</string> + <string>{491.17801, 101.126}</string> </array> <key>Style</key> <dict> @@ -9190,7 +4755,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{383.476, 75.4356}, {96, 14}}</string> + <string>{{383.47601, 75.4356}, {96, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -9237,10 +4802,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 pre_process_plan}</string> <key>VerticalPad</key> @@ -9251,7 +4816,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{263.845, 104.335}, {63, 14}}</string> + <string>{{263.84521, 104.33479}, {63, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -9298,10 +4863,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 startLaunch}</string> <key>VerticalPad</key> @@ -9328,7 +4893,7 @@ Manager}</string> <array> <string>{249.06, 126}</string> <string>{266.134, 126}</string> - <string>{355.634, 125.633}</string> + <string>{355.634, 125.63345}</string> </array> <key>Style</key> <dict> @@ -9415,7 +4980,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -9431,7 +4996,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{232.06, 78.5809}, {17, 204.419}}</string> + <string>{{232.06, 78.580902}, {17, 204.41901}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -9531,7 +5096,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -9610,14 +5175,6 @@ Manager}</string> <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -9649,7 +5206,7 @@ Manager}</string> <integer>95</integer> <key>Points</key> <array> - <string>{219.678, 226.73}</string> + <string>{219.67799, 226.73}</string> <string>{103, 226.73}</string> </array> <key>Style</key> @@ -9703,9 +5260,9 @@ Manager}</string> <integer>93</integer> <key>Points</key> <array> - <string>{103, 88.73}</string> - <string>{198.5, 88.365}</string> - <string>{221.5, 88.365}</string> + <string>{103, 88.730003}</string> + <string>{198.5, 88.364998}</string> + <string>{221.5, 88.364998}</string> </array> <key>Style</key> <dict> @@ -9724,7 +5281,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{151.6, 163.365}, {24, 14}}</string> + <string>{{151.60001, 163.36501}, {24, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -9771,10 +5328,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 start}</string> <key>VerticalPad</key> @@ -9813,7 +5370,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{126.22, 66.9658}, {68, 14}}</string> + <string>{{126.22, 66.965797}, {68, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -9860,10 +5417,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 finishLaunch}</string> <key>VerticalPad</key> @@ -9881,7 +5438,7 @@ Manager}</string> <integer>85</integer> <key>Points</key> <array> - <string>{355.678, 224}</string> + <string>{355.67801, 224}</string> <string>{239, 224}</string> </array> <key>Style</key> @@ -9982,8 +5539,8 @@ Manager}</string> <key>Points</key> <array> <string>{239, 86}</string> - <string>{334.5, 85.635}</string> - <string>{357.5, 85.635}</string> + <string>{334.5, 85.635002}</string> + <string>{357.5, 85.63501}</string> </array> <key>Style</key> <dict> @@ -10002,7 +5559,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{281.475, 160.531}, {24, 14}}</string> + <string>{{281.47501, 160.53101}, {24, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -10049,10 +5606,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 start}</string> <key>VerticalPad</key> @@ -10071,8 +5628,8 @@ Manager}</string> <key>Points</key> <array> <string>{229, 182}</string> - <string>{335, 182.126}</string> - <string>{358, 182.126}</string> + <string>{335, 182.12601}</string> + <string>{358, 182.12601}</string> </array> <key>Style</key> <dict> @@ -10098,8 +5655,8 @@ Manager}</string> <integer>82</integer> <key>Points</key> <array> - <string>{379.568, 217.89}</string> - <string>{508.568, 217}</string> + <string>{379.56799, 217.89}</string> + <string>{508.56799, 217}</string> </array> <key>Style</key> <dict> @@ -10127,7 +5684,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{388.031, 192.225}, {123, 14}}</string> + <string>{{388.03101, 192.22501}, {123, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -10174,10 +5731,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 instance_post_activate}</string> <key>VerticalPad</key> @@ -10195,8 +5752,8 @@ Manager}</string> <integer>80</integer> <key>Points</key> <array> - <string>{381.528, 182.126}</string> - <string>{510.528, 182.171}</string> + <string>{381.52802, 182.12601}</string> + <string>{510.52802, 182.17101}</string> </array> <key>Style</key> <dict> @@ -10224,7 +5781,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{403.118, 156.968}, {93, 14}}</string> + <string>{{403.11801, 156.968}, {93, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -10271,10 +5828,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 activate_instance}</string> <key>VerticalPad</key> @@ -10361,7 +5918,7 @@ Manager}</string> <integer>76</integer> <key>Points</key> <array> - <string>{230.5, 62.4778}</string> + <string>{230.5, 62.477798}</string> <string>{230.5, 241}</string> </array> <key>Style</key> @@ -10388,7 +5945,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{176.5, 29}, {108, 32.9778}}</string> + <string>{{176.5, 29}, {108, 32.977798}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -10413,7 +5970,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -10436,8 +5993,8 @@ Manager}</string> <integer>63</integer> <key>Points</key> <array> - <string>{375, 151.331}</string> - <string>{504, 150.441}</string> + <string>{375, 151.33099}</string> + <string>{504, 150.44099}</string> </array> <key>Style</key> <dict> @@ -10512,10 +6069,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 instance_post_connect}</string> <key>VerticalPad</key> @@ -10533,8 +6090,8 @@ Manager}</string> <integer>61</integer> <key>Points</key> <array> - <string>{376.96, 115.567}</string> - <string>{505.96, 115.612}</string> + <string>{376.95999, 115.567}</string> + <string>{505.95999, 115.612}</string> </array> <key>Style</key> <dict> @@ -10562,7 +6119,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{395.55, 90.4094}, {99, 14}}</string> + <string>{{395.54999, 90.409401}, {99, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -10609,10 +6166,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 create_connection}</string> <key>VerticalPad</key> @@ -10630,8 +6187,8 @@ Manager}</string> <integer>59</integer> <key>Points</key> <array> - <string>{376.96, 86.5585}</string> - <string>{505.96, 86.6035}</string> + <string>{376.95999, 86.558502}</string> + <string>{505.95999, 86.6035}</string> </array> <key>Style</key> <dict> @@ -10659,7 +6216,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{386.048, 61.4004}, {118, 14}}</string> + <string>{{386.048, 61.400398}, {118, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -10706,10 +6263,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 instance_pre_connect}</string> <key>VerticalPad</key> @@ -10720,7 +6277,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{358, 85.635}, {17, 74.365}}</string> + <string>{{358, 85.635002}, {17, 74.364998}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -10752,7 +6309,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{262.22, 64.2358}, {68, 14}}</string> + <string>{{262.21997, 64.235756}, {68, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -10799,10 +6356,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 finishLaunch}</string> <key>VerticalPad</key> @@ -10868,7 +6425,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -10947,14 +6504,6 @@ Manager}</string> <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -10986,8 +6535,8 @@ Manager}</string> <integer>63</integer> <key>Points</key> <array> - <string>{253.942, 203.234}</string> - <string>{382.942, 202.344}</string> + <string>{253.942, 203.23399}</string> + <string>{382.94199, 202.34399}</string> </array> <key>Style</key> <dict> @@ -11015,7 +6564,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{261.898, 177.555}, {128, 14}}</string> + <string>{{261.89801, 177.55499}, {128, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -11062,10 +6611,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 post_create_connection}</string> <key>VerticalPad</key> @@ -11084,7 +6633,7 @@ Manager}</string> <key>Points</key> <array> <string>{253.942, 155.955}</string> - <string>{382.942, 156}</string> + <string>{382.94199, 156}</string> </array> <key>Style</key> <dict> @@ -11159,10 +6708,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 create_connection}</string> <key>VerticalPad</key> @@ -11181,7 +6730,7 @@ Manager}</string> <key>Points</key> <array> <string>{253.894, 121.081}</string> - <string>{382.894, 121.126}</string> + <string>{382.89401, 121.126}</string> </array> <key>Style</key> <dict> @@ -11209,7 +6758,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{260.482, 95.9229}, {123, 14}}</string> + <string>{{260.48199, 95.922897}, {123, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -11256,10 +6805,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 pre_create_connection}</string> <key>VerticalPad</key> @@ -11302,7 +6851,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{138.146, 80.45}, {68, 14}}</string> + <string>{{138.146, 80.449997}, {68, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -11349,10 +6898,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 finishLaunch}</string> <key>VerticalPad</key> @@ -11390,7 +6939,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{77, 46.91}, {17, 59.5455}}</string> + <string>{{77, 46.91}, {17, 59.545502}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>HFlip</key> @@ -11477,7 +7026,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -11544,7 +7093,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -11623,14 +7172,6 @@ Manager}</string> <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -11985,10 +7526,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Process Locality}</string> <key>VerticalPad</key> @@ -12033,10 +7574,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Process Locality}</string> <key>VerticalPad</key> @@ -12081,10 +7622,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Process Locality}</string> <key>VerticalPad</key> @@ -12129,10 +7670,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Process Locality}</string> <key>VerticalPad</key> @@ -12325,10 +7866,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Node Locality}</string> <key>VerticalPad</key> @@ -12373,10 +7914,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Node Locality}</string> <key>VerticalPad</key> @@ -12495,10 +8036,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Global Locality}</string> <key>VerticalPad</key> @@ -12616,14 +8157,6 @@ Manager}</string> <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -12689,7 +8222,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{140.853, 296.455}, {85, 14}}</string> + <string>{{140.853, 296.45499}, {85, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -12736,10 +8269,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 Async Message}</string> <key>VerticalPad</key> @@ -12890,7 +8423,7 @@ Manager}</string> <integer>48</integer> <key>Points</key> <array> - <string>{364.25, 290.028}</string> + <string>{364.25, 290.02777}</string> <string>{364.25, 410.5}</string> </array> <key>Style</key> @@ -12940,7 +8473,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -12968,7 +8501,7 @@ Manager}</string> <integer>45</integer> <key>Points</key> <array> - <string>{246.25, 290.028}</string> + <string>{246.25, 290.02777}</string> <string>{246.25, 410.5}</string> </array> <key>Style</key> @@ -13018,7 +8551,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -13089,7 +8622,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -13105,7 +8638,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{149.591, 85.5909}, {66, 14}}</string> + <string>{{149.591, 85.590897}, {66, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -13152,10 +8685,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 preparePlan}</string> <key>VerticalPad</key> @@ -13193,7 +8726,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{147.727, 55.0909}, {66, 14}}</string> + <string>{{147.72701, 55.0909}, {66, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -13240,10 +8773,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\fs24 \cf0 preparePlan}</string> <key>VerticalPad</key> @@ -13389,7 +8922,7 @@ Manager}</string> <integer>35</integer> <key>Points</key> <array> - <string>{361, 44.0278}</string> + <string>{361, 44.027802}</string> <string>{361, 165}</string> </array> <key>Style</key> @@ -13439,7 +8972,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -13467,7 +9000,7 @@ Manager}</string> <integer>23</integer> <key>Points</key> <array> - <string>{243, 44.0278}</string> + <string>{243, 44.027802}</string> <string>{243, 165}</string> </array> <key>Style</key> @@ -13517,7 +9050,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -13588,7 +9121,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -13667,14 +9200,6 @@ Manager}</string> <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -13711,6 +9236,8 @@ Manager}</string> <integer>33</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> @@ -13751,6 +9278,8 @@ Manager}</string> <integer>32</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> @@ -13793,6 +9322,8 @@ Manager}</string> <integer>31</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> @@ -13862,7 +9393,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -13913,7 +9444,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -13966,10 +9497,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Component Server}</string> <key>VerticalPad</key> @@ -14036,6 +9567,8 @@ Manager}</string> <integer>26</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> @@ -14076,6 +9609,8 @@ Manager}</string> <integer>24</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> @@ -14116,6 +9651,8 @@ Manager}</string> <integer>23</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> @@ -14186,10 +9723,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Component Server}</string> <key>VerticalPad</key> @@ -14239,7 +9776,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -14290,7 +9827,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -14385,7 +9922,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -14460,14 +9997,6 @@ Manager}</string> <integer>2</integer> <key>Style</key> <dict> - <key>fill</key> - <dict> - <key>GradientColor</key> - <dict> - <key>w</key> - <string>0.666667</string> - </dict> - </dict> <key>shadow</key> <dict> <key>Draws</key> @@ -14492,7 +10021,7 @@ Manager}</string> <array> <dict> <key>Bounds</key> - <string>{{269, 360.554}, {38, 14}}</string> + <string>{{269, 360.55399}, {38, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -14528,10 +10057,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Plan C}</string> <key>VerticalPad</key> @@ -14578,10 +10107,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Plan B}</string> <key>VerticalPad</key> @@ -14628,10 +10157,10 @@ Manager}</string> <key>Pad</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Plan A}</string> <key>VerticalPad</key> @@ -14654,6 +10183,8 @@ Manager}</string> <integer>24</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>7.822998046875</real> <key>Points</key> @@ -14663,7 +10194,7 @@ Manager}</string> <string>{259, 423}</string> <string>{83, 408}</string> <string>{83, 118}</string> - <string>{121.9, 113.754}</string> + <string>{121.90001, 113.75391}</string> </array> <key>Style</key> <dict> @@ -14699,13 +10230,15 @@ Manager}</string> <integer>23</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> <array> - <string>{121.9, 239.554}</string> + <string>{121.90001, 239.554}</string> <string>{106, 358}</string> - <string>{121.9, 365.354}</string> + <string>{121.90001, 365.354}</string> </array> <key>Style</key> <dict> @@ -14729,7 +10262,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{121.9, 314.8}, {120.201, 101.108}}</string> + <string>{{121.9, 314.79999}, {120.201, 101.108}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -14761,10 +10294,10 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Component C}</string> <key>VerticalPad</key> @@ -14783,11 +10316,13 @@ Manager}</string> <integer>21</integer> <key>OrthogonalBarAutomatic</key> <true/> + <key>OrthogonalBarPoint</key> + <string>{0, 0}</string> <key>OrthogonalBarPosition</key> <real>-1</real> <key>Points</key> <array> - <string>{242.101, 113.754}</string> + <string>{242.101, 113.75391}</string> <string>{261, 185}</string> <string>{242.601, 239.554}</string> </array> @@ -14845,10 +10380,10 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Component B}</string> <key>VerticalPad</key> @@ -14857,7 +10392,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{121.9, 63.1999}, {120.201, 101.108}}</string> + <string>{{121.9, 63.199902}, {120.201, 101.108}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -14889,10 +10424,10 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\b\fs24 \cf0 Component A}</string> <key>VerticalPad</key> @@ -14901,7 +10436,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{69, 46.508}, {207, 130.492}}</string> + <string>{{69, 46.507999}, {207, 130.492}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -14933,7 +10468,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -14977,7 +10512,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -14989,7 +10524,7 @@ Manager}</string> </dict> <dict> <key>Bounds</key> - <string>{{69, 180.654}, {207, 122.346}}</string> + <string>{{69, 180.65401}, {207, 122.346}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -15021,7 +10556,7 @@ Manager}</string> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290 + <string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf200 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -15100,7 +10635,7 @@ Manager}</string> </dict> </array> <key>Frame</key> - <string>{{17, 66}, {941, 812}}</string> + <string>{{859, 87}, {941, 812}}</string> <key>ListView</key> <true/> <key>OutlineWidth</key> @@ -15114,7 +10649,7 @@ Manager}</string> <key>SidebarWidth</key> <integer>120</integer> <key>VisibleRegion</key> - <string>{{-108, 0}, {792, 658}}</string> + <string>{{-115, 0}, {806, 657}}</string> <key>Zoom</key> <real>1</real> <key>ZoomValues</key> diff --git a/DAnCE/tests/Plan_Launcher/NM-Delay/Deployment.cdp b/DAnCE/tests/Plan_Launcher/NM-Delay/Deployment.cdp new file mode 100644 index 00000000000..42961530d41 --- /dev/null +++ b/DAnCE/tests/Plan_Launcher/NM-Delay/Deployment.cdp @@ -0,0 +1,56 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>LocalityManager_SpawnOne</label> + <UUID>LocalityManager_SpawnOne</UUID> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + + + <instance xmi:id="CompSvrInst"> + <name>LocalityInstance</name> + <node>LocalityOne</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + </instance> + + <instance xmi:id="CompSvrInst2"> + <name>LocalityInstance2</name> + <node>LocalityTwo</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + </instance> + + <instance xmi:id="CompSvrInst3"> + <name>LocalityInstance3</name> + <node>LocalityThree</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + </instance> + + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> +</Deployment:DeploymentPlan> + diff --git a/DAnCE/tests/Plan_Launcher/NM-Delay/NodeMap.cdd b/DAnCE/tests/Plan_Launcher/NM-Delay/NodeMap.cdd new file mode 100755 index 00000000000..399658d524a --- /dev/null +++ b/DAnCE/tests/Plan_Launcher/NM-Delay/NodeMap.cdd @@ -0,0 +1,96 @@ +<?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>83D02FE2-A0BD-11DF-A038-005056C00008</UUID> + + <label/> + + <node> + <name>ExecutionManager</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60006</string> + </value> + </value> + </property> + </resource> + </node> + + <node> + <name>LocalityOne</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60001</string> + </value> + </value> + </property> + </resource> + </node> + + <node> + <name>LocalityTwo</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60002</string> + </value> + </value> + </property> + </resource> + </node> + + <node> + <name>LocalityThree</name> + <label/> + <resource> + <name>Node Address</name> + <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType> + <property> + <name>edu.vanderbilt.dre.DAnCE.StringIOR</name> + <kind>Attribute</kind> + <dynamic>false</dynamic> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>corbaloc:iiop:localhost:60003</string> + </value> + </value> + </property> + </resource> + </node> + +</Deployment:domain> diff --git a/DAnCE/tests/Plan_Launcher/NM-Delay/run_test.pl b/DAnCE/tests/Plan_Launcher/NM-Delay/run_test.pl new file mode 100755 index 00000000000..dd430a2923a --- /dev/null +++ b/DAnCE/tests/Plan_Launcher/NM-Delay/run_test.pl @@ -0,0 +1,261 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 3; +@ports = ( 60001, 60002, 60003 ); +@iorbases = ( "InstOne.ior", "InstTwo.ior", "InstThree.ior" ); +@iorfiles = 0; +@nodenames = ( "LocalityOne", "LocalityTwo", "LocalityThree" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Deployment.cdp"; + + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('.'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('.'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('.'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('.'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + sleep 1; + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60010 -o $ior_nsfile"); + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60010/NameService"; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file --em-ior file://$ior_emfile --domain-timeout 20 --domain-file NodeMap.cdd"); + +$pl_status = $E->Spawn (); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +#Sleep a moment to make sure the PL is properly holding. +print "Sleeping 3 seconds to ensure that PL properly waits on EM reference.\n"; +sleep 3; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService -ORBEndpoint iiop://localhost:60006"); +$em_status = $EM->Spawn (); + +print "Sleeping 3 seconds to ensure that PL properly waits on NM reference.\n"; +sleep 3; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +$pl_status = $E->WaitKill (5); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds to allow task to complete\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/DAnCE/tests/Plan_Launcher/NM-Delay/run_test_ns.pl b/DAnCE/tests/Plan_Launcher/NM-Delay/run_test_ns.pl new file mode 100755 index 00000000000..7812cf69c22 --- /dev/null +++ b/DAnCE/tests/Plan_Launcher/NM-Delay/run_test_ns.pl @@ -0,0 +1,257 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60001 ); +@iorbases = ( "InstOne.ior" ); +@iorfiles = 0; +@nodenames = ( "LocalityOne" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Deployment.cdp"; + + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('.'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('.'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('.'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('.'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file --manager-timeout 10"); + +$pl_status = $E->Spawn (); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +#Sleep a moment to make sure the PL is properly holding. +print "Sleeping 3 seconds to ensure that PL properly waits on EM reference.\n"; +sleep 3; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +$pl_status = $E->WaitKill (5); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Sleeping 10 seconds to allow task to complete\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with --em-ior -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc b/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc index b8a92bf81dc..3e940e70c39 100644 --- a/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc +++ b/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc @@ -1,15 +1,19 @@ // -*- MPC -*- // $Id$ -project (DAnCE_Artifact_Installation_IDL) : danceidldefaults { +project (DAnCE_Artifact_Installation_IDL) : install, danceidldefaults { custom_only = 1 IDL_Files { idlflags += -SS -Sci DAnCE_Artifact_Installation_Handler.idl } + + specific { + install_dir = tools/Artifact_Installation + } } -project (DAnCE_Artifact_Installation) : dance_lib, dynamicinterface, \ +project (DAnCE_Artifact_Installation) : install, dance_lib, dynamicinterface, \ dance_deployment_stub, dance_logger, dance_skel, utils { dynamicflags += DANCE_ARTIFACT_INSTALLATION_BUILD_DLL sharedname = DAnCE_Artifact_Installation @@ -26,9 +30,13 @@ project (DAnCE_Artifact_Installation) : dance_lib, dynamicinterface, \ } IDL_Files { } + + specific { + install_dir = tools/Artifact_Installation + } } -project (DAnCE_Installation_Repository_Manager) : dance_lib, dynamicinterface, dance_artifact_installation, \ +project (DAnCE_Installation_Repository_Manager) : install, dance_lib, dynamicinterface, dance_artifact_installation, \ dance_logger, utils { dynamicflags += INSTALLATION_REPOSITORY_MANAGER_BUILD_DLL sharedname = DAnCE_Installation_Repository_Manager @@ -40,9 +48,13 @@ project (DAnCE_Installation_Repository_Manager) : dance_lib, dynamicinterface, d } IDL_Files { } + + specific { + install_dir = tools/Artifact_Installation + } } -project (DAnCE_File_Installation) : dance_lib, dynamicinterface, dance_artifact_installation, \ +project (DAnCE_File_Installation) : install, dance_lib, dynamicinterface, dance_artifact_installation, \ dance_logger, utils { dynamicflags += ARTIFACT_INSTALLATION_HANDLER_BUILD_DLL sharedname = DAnCE_File_Installation @@ -54,9 +66,13 @@ project (DAnCE_File_Installation) : dance_lib, dynamicinterface, dance_artifact_ } IDL_Files { } + + specific { + install_dir = tools/Artifact_Installation + } } -project (DAnCE_Http_Installation) : dance_lib, dynamicinterface, dance_artifact_installation, \ +project (DAnCE_Http_Installation) : install, dance_lib, dynamicinterface, dance_artifact_installation, \ dance_logger, utils, inet { dynamicflags += ARTIFACT_INSTALLATION_HANDLER_BUILD_DLL sharedname = DAnCE_Http_Installation @@ -68,9 +84,13 @@ project (DAnCE_Http_Installation) : dance_lib, dynamicinterface, dance_artifact_ } IDL_Files { } + + specific { + install_dir = tools/Artifact_Installation + } } -project (DAnCE_Artifact_Installation_Exec) : dance_exe, dance_output, dance_artifact_installation, \ +project (DAnCE_Artifact_Installation_Exec) : install, dance_exe, dance_output, dance_artifact_installation, \ dance_installation_handlers, dance_installation_repository_manager, \ avoids_ace_for_tao, dance_convert_plan, dance_logger { exename = dance_artifact_installation @@ -82,4 +102,8 @@ project (DAnCE_Artifact_Installation_Exec) : dance_exe, dance_output, dance_arti } IDL_Files { } + + specific { + install_dir = tools/Artifact_Installation + } } diff --git a/DAnCE/tools/Config_Handlers/XMLSchema/id_map.hpp b/DAnCE/tools/Config_Handlers/XMLSchema/id_map.hpp index a2843d44693..efc6a8b8bd7 100644 --- a/DAnCE/tools/Config_Handlers/XMLSchema/id_map.hpp +++ b/DAnCE/tools/Config_Handlers/XMLSchema/id_map.hpp @@ -126,6 +126,12 @@ } } + void reset (void) + { + id_map_.clear (); + idref_map_.clear (); + } + private: //id_map_: maps the ID string to the element with the // ID attribute diff --git a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp index e3916d35083..c2e4bb41f89 100644 --- a/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp +++ b/DAnCE/tools/Config_Handlers/XML_File_Intf.cpp @@ -6,6 +6,7 @@ #include "DP_Handler.h" #include "DD_Handler.h" #include "Common.h" +#include "XMLSchema/id_map.hpp" #include "dance/Deployment/Deployment_DataC.h" #include "dance/Deployment/Deployment_TargetDataC.h" @@ -26,7 +27,7 @@ namespace DAnCE { DANCE_TRACE("XML_File_Intf::destructor"); - XML_Helper::XML_HELPER.terminate_parser (); + // XML_Helper::XML_HELPER.terminate_parser (); } bool @@ -58,6 +59,9 @@ namespace DAnCE (LM_TRACE, DLINFO ACE_TEXT ("XML_File_Intf::read_process_plan - ") ACE_TEXT ("DOMElement pointer: %u\n"), foo)); + ID_Map::TSS_ID_Map* TSS_ID_Map (ACE_Singleton<ID_Map::TSS_ID_Map, ACE_Null_Mutex>::instance()); + (*TSS_ID_Map)->reset (); + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_TRACE, DLINFO ACE_TEXT ("XML_File_Intf::read_process_plan - ") ACE_TEXT ("Parsing XML file with XSC\n"))); @@ -131,6 +135,10 @@ namespace DAnCE DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, (LM_TRACE, DLINFO ACE_TEXT ("XML_File_Intf::read_process_domain - ") ACE_TEXT ("Parsing XML file with XSC\n"))); + + ID_Map::TSS_ID_Map* TSS_ID_Map (ACE_Singleton<ID_Map::TSS_ID_Map, ACE_Null_Mutex>::instance()); + (*TSS_ID_Map)->reset (); + Domain dp = DAnCE::Config_Handlers::reader::domain (dom); @@ -216,7 +224,6 @@ namespace DAnCE const ACE_TCHAR *relpath) { DANCE_TRACE("XML_File_Intf::add_search_path"); - XML_Helper::XML_HELPER.get_resolver ().get_resolver ().add_path (environment, relpath); } diff --git a/DAnCE/tools/Convert_Plan/Convert_Plan.mpc b/DAnCE/tools/Convert_Plan/Convert_Plan.mpc index b154f87ac7c..2c731a9676e 100644 --- a/DAnCE/tools/Convert_Plan/Convert_Plan.mpc +++ b/DAnCE/tools/Convert_Plan/Convert_Plan.mpc @@ -1,5 +1,5 @@ // $Id$ -project (DAnCE_Convert_Plan) : dance_lib, dance_output, \ +project (DAnCE_Convert_Plan) : install, dance_lib, dance_output, \ dance_deployment_stub, dance_config_handlers { dynamicflags += DANCE_CONVERT_PLAN_BUILD_DLL @@ -8,14 +8,22 @@ project (DAnCE_Convert_Plan) : dance_lib, dance_output, \ Source_Files { Convert_Plan_Impl.cpp } + + specific { + install_dir = tools/Convert_Plan + } } -project (DAnCE_Convert_Plan_Exec) : dance_exe, dance_output, \ +project (DAnCE_Convert_Plan_Exec) : install, dance_exe, dance_output, \ dance_convert_plan { exename = dance_convert_plan Source_Files { Convert_Plan.cpp } + + specific { + install_dir = tools/Convert_Plan + } } diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc new file mode 100644 index 00000000000..7ccb9c8551a --- /dev/null +++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc @@ -0,0 +1,17 @@ +// $Id$ +project(DAnCE_CORBA_Domain_Validator) : dance_config_handlers, dance_deployment_stub, \ + dance_stub, dance_lib, dance_output, install, \ + taolib { + + after += DAnCE_Domain_Validator_Base + libs += DAnCE_Domain_Validator_Base + dynamicflags += CORBA_DOMAIN_VALIDATOR_BUILD_DLL + + Header_Files { + CORBA_Domain_Validator_impl.h + } + + Source_Files { + CORBA_Domain_Validator_impl.cpp + } +}
\ No newline at end of file diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h new file mode 100644 index 00000000000..2c451c09f95 --- /dev/null +++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h @@ -0,0 +1,57 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// ------------------------------ +#ifndef CORBA_DOMAIN_VALIDATOR_EXPORT_H +#define CORBA_DOMAIN_VALIDATOR_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (CORBA_DOMAIN_VALIDATOR_HAS_DLL) +# define CORBA_DOMAIN_VALIDATOR_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && CORBA_DOMAIN_VALIDATOR_HAS_DLL */ + +#if !defined (CORBA_DOMAIN_VALIDATOR_HAS_DLL) +# define CORBA_DOMAIN_VALIDATOR_HAS_DLL 1 +#endif /* ! CORBA_DOMAIN_VALIDATOR_HAS_DLL */ + +#if defined (CORBA_DOMAIN_VALIDATOR_HAS_DLL) && (CORBA_DOMAIN_VALIDATOR_HAS_DLL == 1) +# if defined (CORBA_DOMAIN_VALIDATOR_BUILD_DLL) +# define CORBA_Domain_Validator_Export ACE_Proper_Export_Flag +# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* CORBA_DOMAIN_VALIDATOR_BUILD_DLL */ +# define CORBA_Domain_Validator_Export ACE_Proper_Import_Flag +# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* CORBA_DOMAIN_VALIDATOR_BUILD_DLL */ +#else /* CORBA_DOMAIN_VALIDATOR_HAS_DLL == 1 */ +# define CORBA_Domain_Validator_Export +# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARATION(T) +# define CORBA_DOMAIN_VALIDATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* CORBA_DOMAIN_VALIDATOR_HAS_DLL == 1 */ + +// Set CORBA_DOMAIN_VALIDATOR_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (CORBA_DOMAIN_VALIDATOR_NTRACE) +# if (ACE_NTRACE == 1) +# define CORBA_DOMAIN_VALIDATOR_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define CORBA_DOMAIN_VALIDATOR_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !CORBA_DOMAIN_VALIDATOR_NTRACE */ + +#if (CORBA_DOMAIN_VALIDATOR_NTRACE == 1) +# define CORBA_DOMAIN_VALIDATOR_TRACE(X) +#else /* (CORBA_DOMAIN_VALIDATOR_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define CORBA_DOMAIN_VALIDATOR_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (CORBA_DOMAIN_VALIDATOR_NTRACE == 1) */ + +#endif /* CORBA_DOMAIN_VALIDATOR_EXPORT_H */ + +// End of auto generated file. diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp new file mode 100644 index 00000000000..19feaff84fe --- /dev/null +++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp @@ -0,0 +1,493 @@ +// -*- C++ -*- +// $Id$ + +#include "CORBA_Domain_Validator_impl.h" + +#include "tao/ORB_Core.h" +#include "ace/OS_NS_sys_time.h" +#include "dance/DAnCE_Utility.h" +#include "dance/Logger/Log_Macros.h" +#include "dance/DAnCE_PropertiesC.h" +#include "tools/Config_Handlers/XML_File_Intf.h" + +// Implementation skeleton constructor +DAnCE_Domain_Validator_i::DAnCE_Domain_Validator_i (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +// Implementation skeleton destructor +DAnCE_Domain_Validator_i::~DAnCE_Domain_Validator_i (void) +{ +} + +bool +DAnCE_Domain_Validator_i::load_domain_from_file (const char * filename) +{ + if (!filename) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT("DAnCE_Domain_Validator_i::load_domain_from_file - ") + ACE_TEXT("Error: Provided with nil filename\n"))); + return false; + } + + ::DAnCE::Config_Handlers::XML_File_Intf file (filename); + + file.add_search_path (ACE_TEXT ("DANCE_ROOT"), ACE_TEXT ("/docs/schema/")); + + ::Deployment::Domain *plan = file.release_domain (); + + if (!plan) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT("DAnCE_Domain_Validator_i::load_domain_from_file - ") + ACE_TEXT("Error: Processing file <%C>\n"), filename)); + return false; + } + + this->domain_ = plan; + return this->create_node_table (); +} + +void +DAnCE_Domain_Validator_i::load_domain (const ::Deployment::Domain & domain) +{ + this->domain_ = &domain; + this->create_node_table (); +} + +bool +DAnCE_Domain_Validator_i::create_node_table (void) +{ + this->node_map_.clear (); + + for (CORBA::ULong i=0; i < domain_->node.length (); ++i) + { + ::Deployment::Resource resource; + + if (!DAnCE::Utility::get_resource_value (DAnCE::NODE_RESOURCE_TYPE, + domain_->node[i].resource, + resource)) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, + DLINFO ACE_TEXT("Node_Locator::process_cdd - ") + ACE_TEXT("Error: Resource <%C> not found.\n"), + DAnCE::NODE_RESOURCE_TYPE)); + return false; + } + const ACE_TCHAR *val = 0; + if (!::DAnCE::Utility::get_satisfierproperty_value (DAnCE::NODE_IOR, + resource.property, + val)) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, + DLINFO ACE_TEXT("Node_Locator::process_cdd - ") + ACE_TEXT("Error: Property <%C> not found.\n"), + DAnCE::NODE_IOR)); + return false; + } + + std::string destination (domain_->node[i].name); + std::string ior(val); + + if (destination != "ExecutionManager") + { + ior += "/"; + ior += domain_->node[i].name; + ior += ".NodeManager"; + } + else + { + ior += "/"; + ior += "ExecutionManager"; + } + + DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO, + (LM_INFO, DLINFO ACE_TEXT("Node_Locator::process_cdd - ") + ACE_TEXT("Storing IOR %C for destination %C\n"), + ior.c_str (), destination.c_str ())); + + this->node_map_ [destination] = ior; + } + + return true; +} + +::CORBA::Boolean +DAnCE_Domain_Validator_i::validate_node (const char * node_name) +{ + // We need to try to re-resolve the reference here, just in case we were working + // with a stale NameService reference before. + + NODE_MAP::const_iterator node_loc = this->node_map_.find (node_name); + + if (node_loc == this->node_map_.end ()) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::validate_node") + ACE_TEXT ("Invalid node %C\n"), + node_name)); + return false; + } + + try + { + CORBA::Object_var object = this->orb_->string_to_object (node_loc->second.c_str ()); + + if (CORBA::is_nil (object)) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::validate_node - ") + ACE_TEXT ("Nil object refernece from string_to_object for node %C\n"), + node_name)); + return false; + } + + bool non_existant = object->_non_existent (); + + if (non_existant) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::validate_node - ") + ACE_TEXT ("Resolved object reference not valid for node %C\n"), + node_name)); + return false; + } + } + catch (CORBA::Exception &ex) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::validate_node - ") + ACE_TEXT ("Caught CORBA Exception whilst resolving node %C: %C\n"), + node_name, + ex._info ().c_str ())); + return false; + } + catch (...) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::validate_node - ") + ACE_TEXT ("Caught C++ exception whilst resolving node %C\n"), + node_name)); + return false; + } + + return true; +} + +ACE_Time_Value +DAnCE_Domain_Validator_i::convert_time_value (const ::DAnCE::Time_Value &time_value) +{ + ACE_Time_Value retval; + + switch (time_value._d ()) + { + case DAnCE::ttSECONDS: + retval.set (time_value.seconds (), 0); + break; + + case DAnCE::ttUSECONDS: + retval.set (0, time_value.useconds ()); + break; + + case DAnCE::ttFRACTIONAL: + retval.set (time_value.time ()); + break; + + default: + break; + } + + return retval; +} + +::CORBA::Boolean +DAnCE_Domain_Validator_i::block_for_node (const char * node_name, + const ::DAnCE::Time_Value & max_block_time) +{ + ACE_Time_Value delay = this->convert_time_value (max_block_time); + ACE_Time_Value timeout (ACE_OS::gettimeofday () + delay); + + // @@ TODO: We'll probably want a more intelligent quantum. + ACE_Time_Value retry (0, 1000000 / 4); + + // We need to try to re-resolve the reference here, just in case we were working + // with a stale NameService reference before. + + NODE_MAP::const_iterator node_loc = this->node_map_.find (node_name); + + if (node_loc == this->node_map_.end ()) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::validate_node") + ACE_TEXT ("Invalid node %C\n"), + node_name)); + return false; + } + + CORBA::Object_var obj; + bool first (true); + ACE_CString last_error; + + do + { + try + { + if (!first) + { + ACE_OS::sleep (retry); + } + else first = false; + + obj = orb_->string_to_object (node_loc->second.c_str ()); + + if (!CORBA::is_nil (obj)) + break; + } + catch (CORBA::Exception &ex) + { + DANCE_ERROR (DANCE_LOG_WARNING, + (LM_ERROR, DLINFO, ACE_TEXT ("Plan_Launcher - ") + ACE_TEXT ("Caught CORBA Exception while resolving Manager object reference: %C\n"), + ex._info ().c_str ())); + last_error = ex._info (); + } + } while (ACE_OS::gettimeofday () < timeout); + + + bool non_existant (false); + first = true; + + do { + try + { + if (!first) + { + ACE_OS::sleep (retry); + } + else first = false; + + non_existant = obj->_non_existent (); + + if (!non_existant) + break; + } + catch (CORBA::Exception &ex) + { + DANCE_ERROR (DANCE_LOG_WARNING, + (LM_ERROR, DLINFO, ACE_TEXT ("Plan_Launcher - ") + ACE_TEXT ("Caught CORBA Exception while resolving Manager object reference: %C\n"), + ex._info ().c_str ())); + last_error = ex._info (); + } + } while (ACE_OS::gettimeofday () < timeout); + + if (non_existant) + { + DANCE_ERROR (DANCE_LOG_EMERGENCY, + (LM_EMERGENCY, DLINFO, ACE_TEXT ("Plan_Launcher - ") + ACE_TEXT ("Unable to validate connection to Manager: %C\n"), + last_error.c_str ())); + return false; + } + return true; +} + +::CORBA::Boolean +DAnCE_Domain_Validator_i::validate_domain (::CORBA::StringSeq_out late_nodes) +{ + bool retval = false; + late_nodes = new ::CORBA::StringSeq (0); + + for (CORBA::ULong i = 0; i < this->domain_->node.length (); ++i) + { + bool node = this->validate_node (this->domain_->node[i].name.in ()); + + if (!node) + { + retval = false; + CORBA::ULong pos (late_nodes->length ()); + late_nodes->length (pos + 1); + late_nodes[pos] = this->domain_->node[i].name.in (); + } + } + + return retval; +} + +::CORBA::Boolean +DAnCE_Domain_Validator_i::block_for_domain (const ::DAnCE::Time_Value & max_block_time, + ::CORBA::StringSeq_out late_nodes) +{ + ACE_Time_Value tv = this->convert_time_value (max_block_time); + ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (tv)); + + late_nodes = new ::CORBA::StringSeq (0); + + NODE_LIST untried_list; + NODE_LIST retry_list; + + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::block_for_domain - ") + ACE_TEXT ("Starting domain check\n"))); + + for (CORBA::ULong i = 0; i < this->domain_->node.length (); ++i) + { + untried_list.push_back (this->domain_->node[i].name.in ()); + } + + for (NODE_LIST::iterator i = untried_list.begin (); + i != untried_list.end (); + ++i) + { + if (ACE_OS::gettimeofday () > timeout) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::block_for_domain - ") + ACE_TEXT ("Timeout occurred while performing initial validation\n"))); + + this->build_late_list (retry_list, late_nodes); + + return false; + } + + bool result = this->validate_node (i->c_str ()); + + if (!result) + { + retry_list.push_back (*i); + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::block_for_domain - ") + ACE_TEXT ("Failed initial check for node %C\n"), + i->c_str ())); + } + else + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::block_for_domain - ") + ACE_TEXT ("Node %C is alive\n"), + i->c_str ())); + } + } + + bool first = true; + // @@ TODO: We'll probably want a more intelligent quantum. + ACE_Time_Value retry (0, 1000000 / 4); + + while ((ACE_OS::gettimeofday () < timeout) && retry_list.size ()) + { + if (!first) + { + ACE_OS::sleep (retry); + } + else first = false; + + for (NODE_LIST::iterator i = retry_list.begin (); + i != retry_list.end (); + ++i) + { + if (ACE_OS::gettimeofday () > timeout) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::block_for_domain - ") + ACE_TEXT ("Timeout occurred while performing follow up validation\n"))); + + this->build_late_list (retry_list, late_nodes); + + return false; + } + + bool result = this->validate_node (i->c_str ()); + + if (result) + { + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::block_for_domain - ") + ACE_TEXT ("Node %C is alive\n"), + i->c_str ())); + retry_list.erase (i); + --i; // need to reposition the iterator so the next ++ will put it in the correct place + } + } + } + + if (retry_list.size () == 0) + { + // all nodes are alive. + DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, + (LM_DEBUG, DLINFO + ACE_TEXT ("DAnCE_Domain_Validator_i::block_for_domain - ") + ACE_TEXT ("All nodes are alive in the domain.\n"))); + return true; + } + + this->build_late_list (retry_list, + late_nodes); + return false; +} + +void +DAnCE_Domain_Validator_i::build_late_list (const NODE_LIST &nodelist, + ::CORBA::StringSeq_out &latelist) +{ + latelist->length (nodelist.size ()); + CORBA::ULong pos (0); + + for (NODE_LIST::const_iterator i = nodelist.begin (); + i != nodelist.end (); + ++i) + { + latelist[pos] = i->c_str (); + } +} + +::CORBA::Boolean +DAnCE_Domain_Validator_i::validate_plan (const ::Deployment::DeploymentPlan & plan, + ::CORBA::StringSeq_out late_nodes) +{ + bool retval; + late_nodes = new ::CORBA::StringSeq (0); + + for (CORBA::ULong i = 0; i < plan.instance.length (); ++i) + { + bool node = this->validate_node (plan.instance[i].node.in ()); + + if (!node) + { + retval = false; + CORBA::ULong pos (late_nodes->length ()); + late_nodes->length (pos + 1); + late_nodes[pos] = this->domain_->node[i].name.in (); + } + } + + return retval; +} + +::CORBA::Boolean +DAnCE_Domain_Validator_i::block_for_plan (const ::Deployment::DeploymentPlan & , + const ::DAnCE::Time_Value & , + ::CORBA::StringSeq_out ) +{ + // Add your implementation here + // ACE_Time_Value tv = this->convert_time_value (max_block_time); + throw CORBA::NO_IMPLEMENT (); +} + diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h new file mode 100644 index 00000000000..fdc039983cf --- /dev/null +++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h @@ -0,0 +1,89 @@ +// -*- C++ -*- +// $Id$ + +/** + * @file CORBA_Domain_Validator_impl.h + * @author William R. Otte <wotte@dre.vanderbilt.edu> + * + * CORBA-based domain validator + */ + +#ifndef DOMAIN_VALIDATORI_TI3IMY_H_ +#define DOMAIN_VALIDATORI_TI3IMY_H_ + +#include "tools/Domain_Validator/Domain_ValidatorS.h" +#include "tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/LocalObject.h" + +#include <map> +#include <list> + +class CORBA_Domain_Validator_Export DAnCE_Domain_Validator_i + : public virtual DAnCE::Domain_Validator, + public virtual ::CORBA::LocalObject +{ +public: + // Constructor + DAnCE_Domain_Validator_i (CORBA::ORB_ptr orb); + + // Destructor + virtual ~DAnCE_Domain_Validator_i (void); + + virtual + bool load_domain_from_file (const char * filename); + + virtual + void load_domain (const ::Deployment::Domain & domain); + + virtual + ::CORBA::Boolean validate_node (const char * node_name); + + virtual + ::CORBA::Boolean block_for_node (const char * node_name, + const ::DAnCE::Time_Value & max_block_time); + + virtual + ::CORBA::Boolean validate_domain (::CORBA::StringSeq_out late_nodes); + + virtual + ::CORBA::Boolean block_for_domain (const ::DAnCE::Time_Value & max_block_time, + ::CORBA::StringSeq_out late_nodes); + + virtual + ::CORBA::Boolean validate_plan (const ::Deployment::DeploymentPlan & plan, + ::CORBA::StringSeq_out late_nodes); + + virtual + ::CORBA::Boolean block_for_plan (const ::Deployment::DeploymentPlan & plan, + const ::DAnCE::Time_Value & max_block_time, + ::CORBA::StringSeq_out late_nodes); + + + + private: + typedef std::list < std::string > NODE_LIST; + + ACE_Time_Value convert_time_value (const ::DAnCE::Time_Value &time_value); + + bool create_node_table (void); + + + void build_late_list (const NODE_LIST &nodelist, + ::CORBA::StringSeq_out &latelist); + + ::CORBA::ORB_var orb_; + + const ::Deployment::Domain *domain_; + + // Maps node names to strings + typedef std::map < std::string, std::string > NODE_MAP; + NODE_MAP node_map_; +}; + + +#endif /* CORBA_DOMAIN_VALIDATOR_IMPL_H_ */ diff --git a/DAnCE/tools/Domain_Validator/Domain_Validator.idl b/DAnCE/tools/Domain_Validator/Domain_Validator.idl new file mode 100644 index 00000000000..4f0e9c1338f --- /dev/null +++ b/DAnCE/tools/Domain_Validator/Domain_Validator.idl @@ -0,0 +1,66 @@ +// $Id$ + +/** + * @file Domain_Validator.idl + * @author William R. Otte <wotte@dre.vanderbilt.edu> + * + * Abstract interface for a domain validator that checks if a domain is ready + * for deployment. + */ + +#include "dance/Deployment/Deployment_TargetData.idl" +#include "dance/Deployment/Deployment_DeploymentPlan.idl" + +module DAnCE +{ + enum TimeType + { + ttSECONDS, + ttUSECONDS, + ttFRACTIONAL + }; + + union Time_Value switch (TimeType) + { + /// Desired delay in seconds + case ttSECONDS: long seconds; + /// Desired delay in useconds + case ttUSECONDS: long long useconds; + /// Double represending desired delay, in seconds with remainder as useconds. + case ttFRACTIONAL: double time; + }; + + local interface Domain_Validator + { + /// Loads a domain from a plan file. + boolean load_domain_from_file (in string filename); + + /// Initializes the domain validator with a provided domain object. + void load_domain (in ::Deployment::Domain domain); + + /// Validates + boolean validate_node (in string node_name); + + /// blocks until a given node is made ready + boolean block_for_node (in string node_name, + in Time_Value max_block_time); + + /// Returns a true if the domain is completely ready for deployment. + /// Otherwise, returns false and populates @param late_nodes with the names + /// of late nodes. + boolean validate_domain (out CORBA::StringSeq late_nodes); + + /// Blocks for the specified amount of time waiting for the domain to become ready, + /// retruns true if successful, false if timeout reached. Late nodes are + boolean block_for_domain (in Time_Value max_block_time, + out CORBA::StringSeq late_nodes); + + boolean validate_plan (in ::Deployment::DeploymentPlan plan, + out CORBA::StringSeq late_nodes); + + boolean block_for_plan (in ::Deployment::DeploymentPlan plan, + in Time_Value max_block_time, + out CORBA::StringSeq late_nodes); + + }; +}; diff --git a/DAnCE/tools/Domain_Validator/Domain_Validator.mpc b/DAnCE/tools/Domain_Validator/Domain_Validator.mpc new file mode 100644 index 00000000000..94428bf16f2 --- /dev/null +++ b/DAnCE/tools/Domain_Validator/Domain_Validator.mpc @@ -0,0 +1,27 @@ +// $Id$ +project(DAnCE_Domain_Validator_Base) : dance_deployment_stub, dance_lib, dance_output, install, \ + taolib_with_idl { + + idlflags += \ + -Wb,stub_export_macro=DAnCE_Domain_Validator_Stub_Export \ + -Wb,stub_export_include=DAnCE_Domain_Validator_stub_export.h \ + -Wb,skel_export_macro=DAnCE_Domain_Validator_Stub_Export \ + -Wb,skel_export_include=DAnCE_Domain_Validator_stub_export.h \ + -Gxhst -Gxhsk + + dynamicflags += DAnCE_Domain_Validator_Stub_BUILD_DLL + + IDL_Files { + Domain_Validator.idl + } + + Source_Files { + Domain_ValidatorC.cpp + Domain_ValidatorS.cpp + } + + Header_Files { + Domain_ValidatorC.h + Domain_ValidatorS.h + } +} diff --git a/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc b/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc index 874c5f28b31..3904912c94f 100644 --- a/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc +++ b/DAnCE/tools/Logger_Backend/ndds/NDDS_Logger.mpc @@ -20,6 +20,10 @@ project(DAnCE_NDDS_Logger) : ndds_cck_ts_defaults, nddslib, taolib_with_idl, dan Source_Files { Log_Backend.cpp } + + specific { + install_dir = tools/Logger_Backend/ndds + } } project(DAnCE_NDDS_Log_Server) : ndds_cck_ts_defaults, nddsexe, taoidldefaults, taoclient, dance_output, install { @@ -33,4 +37,8 @@ project(DAnCE_NDDS_Log_Server) : ndds_cck_ts_defaults, nddsexe, taoidldefaults, Log_RecordSupport.cxx Log_Server.cpp } -}
\ No newline at end of file + + specific { + install_dir = tools/Logger_Backend/ndds + } +} diff --git a/DAnCE/tools/Split_Plan/Split_Plan.cpp b/DAnCE/tools/Split_Plan/Split_Plan.cpp index 8a91a94a765..286ca28ecce 100644 --- a/DAnCE/tools/Split_Plan/Split_Plan.cpp +++ b/DAnCE/tools/Split_Plan/Split_Plan.cpp @@ -10,6 +10,10 @@ #include "Split_Plan.h" #include "dance/Logger/Log_Macros.h" +#ifdef _OPENMP +#include <omp.h> +#endif + namespace DAnCE { template <class SPLITTER, class UUIDGEN> @@ -111,7 +115,6 @@ namespace DAnCE } sub_plan.localityConstraint = default_loc; - } else { @@ -142,214 +145,250 @@ namespace DAnCE ACE_TEXT("proceeding to copying phase\n"), this->sub_plans_.current_size ())); - /* - * Copying phase - */ - - // (1) Iterate over the <instance> field of the global DeploymentPlan - // structure. - // (2) Retrieve the necessary information to contruct the sub plans - // one by one. - for (CORBA::ULong i = 0; i < plan.instance.length (); ++i) + // build instance lists + TSubPlanList sub_plan_list; + for (TSubPlanIterator iter_plans = this->sub_plans_.begin (); + iter_plans != this->sub_plans_.end (); + ++iter_plans) { - DANCE_DEBUG (DANCE_LOG_TRACE, (LM_TRACE, DLINFO - ACE_TEXT("Split_Plan::split_plan - ") - ACE_TEXT("Processing instance: %C\n"), - plan.instance[i].name.in())); - - // TODO - - // Get the sub plan. - TSubPlanKey sub_plan_key; - Deployment::DeploymentPlan sub_plan; - - // find sub plan for instance (if any) - if (!this->find_sub_plan (plan_splitter, i, sub_plan_key, sub_plan)) - { - DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO - ACE_TEXT("Split_Plan::split_plan - ") - ACE_TEXT("Instance %C excluded from selected subplans\n"), - plan.instance[i].name.in ())); - continue; - } - - // Get the instance deployment description - const Deployment::InstanceDeploymentDescription & my_instance = - plan.instance[i]; - - // Fill in the contents of the sub plan entry. - - // Append the "MonolithicDeploymentDescriptions implementation" - // field with a new "implementation", which is specified by the - // <implementationRef> field of <my_instance> entry. - Deployment::MonolithicDeploymentDescription const & my_implementation - = plan.implementation[my_instance.implementationRef]; - - CORBA::ULong index_imp = sub_plan.implementation.length (); - sub_plan.implementation.length (index_imp + 1); - sub_plan.implementation[index_imp] = my_implementation; - - // update the "ArtifactDeploymentDescriptions" <artifact> field - // of the sub plan with the artifacts referenced by the <artifactRef> - // sequence of the added implementation - - // Initialize with the correct sequence length. - CORBA::ULongSeq ulong_seq; - ulong_seq.length (my_implementation.artifactRef.length ()); - - // append the "ArtifactDeploymentDescriptions" - CORBA::ULong const impl_length = - my_implementation.artifactRef.length (); - CORBA::ULong const artifact_offset = sub_plan.artifact.length (); - - // extend <artifact> sequence to required size - sub_plan.artifact.length (artifact_offset + impl_length); - - for (CORBA::ULong iter = 0; - iter < impl_length; - iter ++) - { - CORBA::ULong artifact_ref = my_implementation.artifactRef[iter]; - - // Fill in the <artifact> field of the sub plan - sub_plan.artifact[artifact_offset + iter] = - plan.artifact[artifact_ref]; - - // Fill in the artifactRef field of the - // MonolithicDeploymentDescription - ulong_seq[iter] = artifact_offset + iter; - } - - // Change the <artifactRef> field of the added "implementation" to - // reference the artifact field of the sub plan - sub_plan.implementation[index_imp].artifactRef = ulong_seq; - - // Append the "InstanceDeploymentDescription instance" field with - // a new "instance", which is almost the same as the "instance" in - // the global plan except the <implementationRef> field. - CORBA::ULong index_ins = sub_plan.instance.length (); - sub_plan.instance.length (index_ins + 1); - sub_plan.instance[index_ins] = my_instance; + // get the sub plan and key for current instance + TSubPlanKey& sub_plan_key = (*iter_plans).ext_id_; + SubPlanList list_item; + list_item.first = sub_plan_key; - // Update the <implementationRef> field of the "instance". - sub_plan.instance[index_ins].implementationRef = index_imp; + sub_plan_list.push_back (list_item); + } - DANCE_DEBUG (DANCE_LOG_TRACE, (LM_TRACE, DLINFO - ACE_TEXT("Split_Plan::split_plan - ") - ACE_TEXT("Processing connections.\n"))); - // Copy connections - for (CORBA::ULong j = 0; j < plan.connection.length (); ++j) - { - DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO - ACE_TEXT("Split_Plan::split_plan - ") - ACE_TEXT("Connection: %C\n"), - plan.connection[j].name.in ())); - for (CORBA::ULong k = 0; - k < plan.connection[j].internalEndpoint.length (); ++k) - { - DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO - ACE_TEXT("Split_Plan::split_plan - ") - ACE_TEXT("Endpoint: %C(%C)\n"), - plan.connection[j].internalEndpoint[k].portName.in (), - plan.connection[j].internalEndpoint[k].provider ? - "provider" : "client")); - - // check if connection endpoint references the instance (i) - // we're adding to the sub plan - if (i == plan.connection[j].internalEndpoint[k].instanceRef) - { - Deployment::PlanConnectionDescription * - connection_copied = 0; - - // check if we already copied this connection - // (for an earlier endpoint match) - for (CORBA::ULong m = 0; - m < sub_plan.connection.length (); ++m) - { - if (ACE_OS::strcmp (plan.connection[j].name.in (), - sub_plan.connection[m].name.in ()) == 0) - { - connection_copied = &sub_plan.connection[m]; - break; - } - } - - if (!connection_copied) - { - // Copy the connection - CORBA::ULong const index_con = - sub_plan.connection.length(); - sub_plan.connection.length (index_con + 1); - sub_plan.connection[index_con] = plan.connection[j]; - connection_copied = &sub_plan.connection[index_con]; - connection_copied->internalEndpoint.length (0); - } - - // Copy the endpoint - CORBA::ULong const index_ep = - connection_copied->internalEndpoint.length(); - - DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO - ACE_TEXT("Split_Plan::split_plan - ") - ACE_TEXT ("Copying endpoint %u into endpoint %u\n"), - k, index_ep)); - - connection_copied->internalEndpoint.length ( - index_ep + 1); - connection_copied->internalEndpoint[index_ep] = - plan.connection[j].internalEndpoint[k]; - connection_copied->internalEndpoint[index_ep].instanceRef - = index_ins; - } - } - } +#ifdef _OPENMP +#pragma omp parallel for + for (int i = 0; i < static_cast<int> (sub_plan_list.size ()); ++i) +#else + for (CORBA::ULong i = 0; i < sub_plan_list.size (); ++i) +#endif + { + // get the sub plan and key for current instance + TSubPlanKey& sub_plan_key = sub_plan_list[i].first; + std::list < CORBA::ULong > &instances = sub_plan_list[i].second; - // copy any locality constraints matching the instance we're - // adding to the sub plan - for (CORBA::ULong j = 0; - j < plan.localityConstraint.length (); ++j) + for (CORBA::ULong i = 0; i < plan.instance.length (); ++i) { - const Deployment::PlanLocality &loc = - plan.localityConstraint[j]; - for (CORBA::ULong k = 0; - k < loc.constrainedInstanceRef.length (); ++k) - { - // we are the same instance... - if (loc.constrainedInstanceRef[k] == i) - { - // add our new instance ref to the sub plan's - // corresponding contraint. - CORBA::ULong sub_loc_len = - sub_plan.localityConstraint[j].constrainedInstanceRef.length (); - - DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, - (LM_TRACE, - DLINFO ACE_TEXT ("Split_Plan::split_plan - ") - ACE_TEXT ("Found matching locality constraint ") - ACE_TEXT ("%u:%u,") - ACE_TEXT (" adding to %u:%u as %u\n"), - j, k, j, sub_loc_len, index_ins)); - - // set the correct constraint type - sub_plan.localityConstraint[j].constraint = - loc.constraint; - - // add instance reference to matched contraint - // thank god someone made an 18 and 20+ char - // member variable... - sub_plan.localityConstraint[j].constrainedInstanceRef.length ( - sub_loc_len + 1); - sub_plan.localityConstraint[j].constrainedInstanceRef[ - sub_loc_len] = index_ins; - } - } + if (plan_splitter.match_sub_plan (i, sub_plan_key)) + instances.push_back (i); } - - // rebing updated sub plan - this->sub_plans_.rebind (sub_plan_key, sub_plan); } /* + * Copying phase + */ + + // (1) Iterate over the <instance> field of the global DeploymentPlan + // structure. + // (2) Retrieve the necessary information to contruct the sub plans + // one by one. +#ifdef _OPENMP +#pragma omp parallel for + for (int i = 0; i < static_cast <int> (sub_plan_list.size ()); ++i) +#else + for (CORBA::ULong i = 0; i < (sub_plan_list.size ()); ++i) +#endif + { + // get the sub plan and key for current instance + TSubPlanKey& sub_plan_key = sub_plan_list[i].first; + + ::Deployment::DeploymentPlan sub_plan; + + this->sub_plans_.find (sub_plan_key, sub_plan); + + // Get instance list + std::list <CORBA::ULong> &instances = sub_plan_list[i].second; + + for (InstanceList::const_iterator i = instances.begin (); + i != instances.end (); + ++i) + { + CORBA::ULong pos = *i; + + DANCE_DEBUG (DANCE_LOG_TRACE, (LM_TRACE, DLINFO + ACE_TEXT("Split_Plan::split_plan - ") + ACE_TEXT("Processing instance: %C\n"), + plan.instance[pos].name.in())); + + // Get the instance deployment description + const Deployment::InstanceDeploymentDescription & my_instance = + plan.instance[pos]; + + // Fill in the contents of the sub plan entry. + + // Append the "MonolithicDeploymentDescriptions implementation" + // field with a new "implementation", which is specified by the + // <implementationRef> field of <my_instance> entry. + Deployment::MonolithicDeploymentDescription const & my_implementation + = plan.implementation[my_instance.implementationRef]; + + CORBA::ULong index_imp = sub_plan.implementation.length (); + sub_plan.implementation.length (index_imp + 1); + sub_plan.implementation[index_imp] = my_implementation; + + // update the "ArtifactDeploymentDescriptions" <artifact> field + // of the sub plan with the artifacts referenced by the <artifactRef> + // sequence of the added implementation + + // Initialize with the correct sequence length. + CORBA::ULongSeq ulong_seq; + ulong_seq.length (my_implementation.artifactRef.length ()); + + // append the "ArtifactDeploymentDescriptions" + CORBA::ULong const impl_length = + my_implementation.artifactRef.length (); + CORBA::ULong const artifact_offset = sub_plan.artifact.length (); + + // extend <artifact> sequence to required size + sub_plan.artifact.length (artifact_offset + impl_length); + + for (CORBA::ULong iter = 0; + iter < impl_length; + iter ++) + { + CORBA::ULong artifact_ref = my_implementation.artifactRef[iter]; + + // Fill in the <artifact> field of the sub plan + sub_plan.artifact[artifact_offset + iter] = + plan.artifact[artifact_ref]; + + // Fill in the artifactRef field of the + // MonolithicDeploymentDescription + ulong_seq[iter] = artifact_offset + iter; + } + + // Change the <artifactRef> field of the added "implementation" to + // reference the artifact field of the sub plan + sub_plan.implementation[index_imp].artifactRef = ulong_seq; + + // Append the "InstanceDeploymentDescription instance" field with + // a new "instance", which is almost the same as the "instance" in + // the global plan except the <implementationRef> field. + CORBA::ULong index_ins = sub_plan.instance.length (); + sub_plan.instance.length (index_ins + 1); + sub_plan.instance[index_ins] = my_instance; + + // Update the <implementationRef> field of the "instance". + sub_plan.instance[index_ins].implementationRef = index_imp; + + DANCE_DEBUG (DANCE_LOG_TRACE, (LM_TRACE, DLINFO + ACE_TEXT("Split_Plan::split_plan - ") + ACE_TEXT("Processing connections.\n"))); + // Copy connections + for (CORBA::ULong j = 0; j < plan.connection.length (); ++j) + { + DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO + ACE_TEXT("Split_Plan::split_plan - ") + ACE_TEXT("Connection: %C\n"), + plan.connection[j].name.in ())); + for (CORBA::ULong k = 0; + k < plan.connection[j].internalEndpoint.length (); ++k) + { + DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO + ACE_TEXT("Split_Plan::split_plan - ") + ACE_TEXT("Endpoint: %C(%C)\n"), + plan.connection[j].internalEndpoint[k].portName.in (), + plan.connection[j].internalEndpoint[k].provider ? + "provider" : "client")); + + // check if connection endpoint references the instance (i) + // we're adding to the sub plan + if (pos == plan.connection[j].internalEndpoint[k].instanceRef) + { + Deployment::PlanConnectionDescription * + connection_copied = 0; + + // check if we already copied this connection + // (for an earlier endpoint match) + for (CORBA::ULong m = 0; + m < sub_plan.connection.length (); ++m) + { + if (ACE_OS::strcmp (plan.connection[j].name.in (), + sub_plan.connection[m].name.in ()) == 0) + { + connection_copied = &sub_plan.connection[m]; + break; + } + } + + if (!connection_copied) + { + // Copy the connection + CORBA::ULong const index_con = + sub_plan.connection.length(); + sub_plan.connection.length (index_con + 1); + sub_plan.connection[index_con] = plan.connection[j]; + connection_copied = &sub_plan.connection[index_con]; + connection_copied->internalEndpoint.length (0); + } + + // Copy the endpoint + CORBA::ULong const index_ep = + connection_copied->internalEndpoint.length(); + + DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, DLINFO + ACE_TEXT("Split_Plan::split_plan - ") + ACE_TEXT ("Copying endpoint %u into endpoint %u\n"), + k, index_ep)); + + connection_copied->internalEndpoint.length ( + index_ep + 1); + connection_copied->internalEndpoint[index_ep] = + plan.connection[j].internalEndpoint[k]; + connection_copied->internalEndpoint[index_ep].instanceRef + = index_ins; + } + } + } + + // copy any locality constraints matching the instance we're + // adding to the sub plan + for (CORBA::ULong j = 0; + j < plan.localityConstraint.length (); ++j) + { + const Deployment::PlanLocality &loc = + plan.localityConstraint[j]; + for (CORBA::ULong k = 0; + k < loc.constrainedInstanceRef.length (); ++k) + { + // we are the same instance... + if (loc.constrainedInstanceRef[k] == pos) + { + // add our new instance ref to the sub plan's + // corresponding contraint. + CORBA::ULong sub_loc_len = + sub_plan.localityConstraint[j].constrainedInstanceRef.length (); + + DANCE_DEBUG (DANCE_LOG_DETAILED_TRACE, + (LM_TRACE, + DLINFO ACE_TEXT ("Split_Plan::split_plan - ") + ACE_TEXT ("Found matching locality constraint ") + ACE_TEXT ("%u:%u,") + ACE_TEXT (" adding to %u:%u as %u\n"), + j, k, j, sub_loc_len, index_ins)); + + // set the correct constraint type + sub_plan.localityConstraint[j].constraint = + loc.constraint; + + // add instance reference to matched contraint + // thank god someone made an 18 and 20+ char + // member variable... + sub_plan.localityConstraint[j].constrainedInstanceRef.length ( + sub_loc_len + 1); + sub_plan.localityConstraint[j].constrainedInstanceRef[ + sub_loc_len] = index_ins; + } + } + } + } + // rebing updated sub plan + this->sub_plans_.rebind (sub_plan_key, sub_plan); + } + /* * Finalization */ diff --git a/DAnCE/tools/Split_Plan/Split_Plan.h b/DAnCE/tools/Split_Plan/Split_Plan.h index aba0f71c0a8..98b8b09ade8 100644 --- a/DAnCE/tools/Split_Plan/Split_Plan.h +++ b/DAnCE/tools/Split_Plan/Split_Plan.h @@ -23,6 +23,9 @@ #include "Split_Plan/DAnCE_Split_Plan_export.h" #include "Sub_UUID_Generator.h" +#include <list> +#include <vector> + namespace DAnCE { template <class SPLITTER, class UUIDGEN = Unique_Sub_UUID_Generator> @@ -37,6 +40,12 @@ namespace DAnCE typedef ACE_Map_Manager<TSubPlanKey, Deployment::DeploymentPlan, ACE_Null_Mutex> TSubPlans; + + typedef std::list <CORBA::ULong > InstanceList; + typedef std::pair < TSubPlanKey, InstanceList > SubPlanList; + + typedef std::vector < SubPlanList > TSubPlanList; + typedef typename TSubPlans::iterator TSubPlanIterator; typedef typename TSubPlans::const_iterator TSubPlanConstIterator; diff --git a/DAnCE/tools/Split_Plan/Split_Plan.mpc b/DAnCE/tools/Split_Plan/Split_Plan.mpc index 180aec7375d..7d7d632493c 100644 --- a/DAnCE/tools/Split_Plan/Split_Plan.mpc +++ b/DAnCE/tools/Split_Plan/Split_Plan.mpc @@ -3,6 +3,7 @@ project (DAnCE_Split_Plan_Impl) : dance_lib, dance_stub, dance_deployment_stub, dance_output, dance_logger, install { dynamicflags += DANCE_SPLIT_PLAN_BUILD_DLL includes += $(DANCE_ROOT)/tools + Source_Files { Node_Splitter.cpp Locality_Splitter.cpp @@ -15,7 +16,7 @@ project (DAnCE_Split_Plan_Impl) : dance_lib, dance_stub, dance_deployment_stub, } project (DAnCE_Split_Plan_Exec) : dance_exe, dance_output, dance_split_plan, \ - avoids_ace_for_tao, dance_convert_plan, dance_logger, install { + avoids_ace_for_tao, dance_convert_plan, dance_logger, install, openmp { exename = dance_split_plan Source_Files { diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc index 3ba6bf7fb48..9a52ea1d7ca 100644 --- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc +++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DAnCE_SHS_CORBA_Transport) : dance_lib, dance_output, dance_logger, \ +project (DAnCE_SHS_CORBA_Transport) : install, dance_lib, dance_output, dance_logger, \ dance_shs_daemon, naming, dance_deployment_scheduler { dynamicflags += DANCE_SHS_CORBA_TRANSPORT_BUILD_DLL @@ -13,9 +13,13 @@ project (DAnCE_SHS_CORBA_Transport) : dance_lib, dance_output, dance_logger, \ SHS_Transport.h SHS_CORBA_Transport.h } + + specific { + install_dir = tools/System_Health/Interceptors + } } -project (DAnCE_SHS_Interceptors) : dance_skel, dance_lib, dance_output, dance_logger, \ +project (DAnCE_SHS_Interceptors) : install, dance_skel, dance_lib, dance_output, dance_logger, \ dance_shs_daemon, naming { dynamicflags += DANCE_SHS_INTERCEPTORS_BUILD_DLL after += DAnCE_SHS_CORBA_Transport @@ -28,4 +32,8 @@ project (DAnCE_SHS_Interceptors) : dance_skel, dance_lib, dance_output, dance_lo Header_Files { SHS_Interceptor.h } + + specific { + install_dir = tools/System_Health/Interceptors + } } diff --git a/DAnCE/tools/System_Health/System_Health.mpc b/DAnCE/tools/System_Health/System_Health.mpc index c7393dfed97..a120521d7ac 100644 --- a/DAnCE/tools/System_Health/System_Health.mpc +++ b/DAnCE/tools/System_Health/System_Health.mpc @@ -28,6 +28,7 @@ project (DAnCE_System_Health_stub) : install, dance_lib, dance_output, gen_ostre Header_Files { SHS_DataModelC.h + SystemHealth_stub_export.h } specific { diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9c7e144dc06..45f10f8564c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,9 +1,47 @@ +Mon Nov 07 10:31:14 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * docs/compilet.html: + Add option -oE and -oN . + +Mon Nov 07 10:10:14 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_util.cpp: + * TAO_IDL/be_include/be_global.h: + * TAO_IDL/be_include/be_util.h: + Add option -oE: Output directory for the generated CIAO executor files + and option -oN for not overwrite CIAO executor files. + + + +Sat Nov 05 18:18:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tests/Bug_3531b_Regression/server.cpp: + Fixed WChar build problems. + +Fri Nov 4 07:28:29 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/Options.html: + Extended documentation for ORBWaitStrategy mt_noupcall + +Thu Nov 03 09:51:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Fixed error in previous commit + +Thu Nov 03 08:45:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tests/Bug_3531b_Regression/server.cpp: + Fixed compile warning on Solaris10 build. + Wed Nov 02 13:30:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - Put narrow in var, use ACE_NEW with CIAO_FACET + Put narrow in var, use ACE_NEW with CIAO_FACET + - Wed Nov 02 08:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> Merged changes from Remedy work branch. diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 856b20614c4..782f51a9bf4 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1183,8 +1183,8 @@ TAO_CodeGen::start_ciao_exec_header (const char *fname) -1); int status = - this->ciao_exec_header_->open (fname, - TAO_OutStream::CIAO_EXEC_HDR); + this->ciao_exec_header_->open (fname, + TAO_OutStream::CIAO_EXEC_HDR); if (status == -1) { @@ -1240,7 +1240,6 @@ TAO_CodeGen::start_ciao_exec_source (const char *fname) int status = this->ciao_exec_source_->open (fname, TAO_OutStream::CIAO_EXEC_IMPL); - if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -2045,7 +2044,7 @@ TAO_CodeGen::gen_export_file (const char *filename, ACE_CString file_str; const char *output_path = - be_util::get_output_path (false, for_skel); + be_util::get_output_path (false, for_skel, false); if (output_path != 0) { diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index d24446abc8e..370eb6e2b18 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -92,6 +92,7 @@ BE_GlobalData::BE_GlobalData (void) stub_include_dir_ (0), skel_output_dir_ (0), anyop_output_dir_ (0), + exec_output_dir_ (0), any_support_ (true), cdr_support_ (true), tc_support_ (true), @@ -139,6 +140,7 @@ BE_GlobalData::BE_GlobalData (void) gen_ciao_exec_idl_ (false), gen_ciao_exec_impl_ (false), gen_ciao_exec_reactor_impl_ (false), + overwrite_not_exec_(false), gen_ciao_conn_impl_ (false), gen_dds_typesupport_idl_ (false), gen_ciao_valuefactory_reg_ (true), @@ -182,7 +184,8 @@ be_change_idl_file_extension (UTL_String* idl_file, const char *new_extension, bool base_name_only = false, bool for_anyop = false, - bool for_skel = false) + bool for_skel = false, + bool for_exec = false) { // @@ This shouldn't happen anyway; but a better error handling // mechanism is needed. @@ -227,7 +230,7 @@ be_change_idl_file_extension (UTL_String* idl_file, // Anyop * skel file output defaults to general output dir if not set. const char *output_path = - be_util::get_output_path (for_anyop, for_skel); + be_util::get_output_path (for_anyop, for_skel, for_exec); if (!base_name_only && output_path != 0) { @@ -272,7 +275,6 @@ be_change_idl_file_extension (UTL_String* idl_file, // Append the newextension. ACE_OS::strcat (fname, new_extension); - return fname; } @@ -443,7 +445,10 @@ BE_GlobalData::be_get_ciao_exec_header (UTL_String *idl_file_name, { return be_change_idl_file_extension (idl_file_name, be_global->ciao_exec_header_ending (), - base_name_only); + base_name_only, + false, + false, + true); } const char * @@ -452,7 +457,10 @@ BE_GlobalData::be_get_ciao_exec_source (UTL_String *idl_file_name, { return be_change_idl_file_extension (idl_file_name, be_global->ciao_exec_source_ending (), - base_name_only); + base_name_only, + false, + false, + true); } const char * @@ -1498,6 +1506,17 @@ BE_GlobalData::output_dir (void) const { return this->output_dir_; } +bool +BE_GlobalData::overwrite_not_exec (void) const +{ + return this->overwrite_not_exec_; +} + +void +BE_GlobalData::overwrite_not_exec (bool val) +{ + this->overwrite_not_exec_ = val; +} void BE_GlobalData::skel_output_dir (const char* s) @@ -1539,6 +1558,18 @@ BE_GlobalData::anyop_output_dir (void) const } void +BE_GlobalData::exec_output_dir (const char* s) +{ + ACE::strdelete (this->exec_output_dir_); + this->exec_output_dir_ = ACE::strnew (s); +} + +const char* +BE_GlobalData::exec_output_dir (void) const +{ + return this->exec_output_dir_; +} +void BE_GlobalData::any_support (bool val) { this->any_support_ = val; @@ -2032,6 +2063,9 @@ BE_GlobalData::destroy (void) ACE::strdelete (this->anyop_output_dir_); this->anyop_output_dir_ = 0; + ACE::strdelete (this->exec_output_dir_); + this->exec_output_dir_ = 0; + if (0 != this->messaging_) { this->messaging_->destroy (); @@ -2924,6 +2958,61 @@ BE_GlobalData::parse_args (long &i, char **av) )); } } + else if (av[i][2] == 'E') + { + if (av[i][3] == '\0') + { + idl_global->append_idl_flag (av[i + 1]); + int result = ACE_OS::mkdir (av[i + 1]); + + #if !defined (__BORLANDC__) + if (result != 0 && errno != EEXIST) + #else + // The Borland RTL doesn't give EEXIST back, only EACCES in + // case the directory exists, reported to Borland as QC 9495 + if (result != 0 && errno != EEXIST && errno != EACCES) + #endif + { + ACE_ERROR (( + LM_ERROR, + ACE_TEXT ("IDL: unable to create directory %C") + ACE_TEXT (" specified by -oE option\n"), + av[i + 1] + )); + + break; + } + + be_global->exec_output_dir (av[i + 1]); + ++i; + } + else + { + ACE_ERROR (( + LM_ERROR, + ACE_TEXT ("IDL: I don't understand") + ACE_TEXT (" the '%C' option\n"), + av[i] + )); + } + } + else if (av[i][2] == 'N') + { + if (av[i][3] == '\0') + { + // Don't overwrite exec files. + be_global->overwrite_not_exec (true); + } + else + { + ACE_ERROR (( + LM_ERROR, + ACE_TEXT ("IDL: I don't understand") + ACE_TEXT (" the '%C' option\n"), + av[i] + )); + } + } else if (av[i][2] == 'S') { if (av[i][3] == '\0') diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp index aa74be74b5c..75d88932c39 100644 --- a/TAO/TAO_IDL/be/be_produce.cpp +++ b/TAO/TAO_IDL/be/be_produce.cpp @@ -74,6 +74,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_extern.h" #include "fe_extern.h" #include "global_extern.h" +#include "be_util.h" // Clean up before exit, whether successful or not. TAO_IDL_BE_Export void @@ -239,13 +240,17 @@ BE_produce (void) if (be_global->gen_ciao_exec_impl ()) { - ctx.state (TAO_CodeGen::TAO_ROOT_EXH); - be_visitor_root_exh root_exh_visitor (&ctx); - BE_visit_root (root_exh_visitor, "CIAO exec impl header"); - - ctx.state (TAO_CodeGen::TAO_ROOT_EXS); - be_visitor_root_exs root_exs_visitor (&ctx); - BE_visit_root (root_exs_visitor, "CIAO exec impl source"); + bool generate = be_util::overwrite_ciao_exec_files (); + if(generate) + { + ctx.state (TAO_CodeGen::TAO_ROOT_EXH); + be_visitor_root_exh root_exh_visitor (&ctx); + BE_visit_root (root_exh_visitor, "CIAO exec impl header"); + + ctx.state (TAO_CodeGen::TAO_ROOT_EXS); + be_visitor_root_exs root_exs_visitor (&ctx); + BE_visit_root (root_exs_visitor, "CIAO exec impl source"); + } } if (be_global->gen_ciao_conn_impl ()) diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index a3dd1bf7e12..0e5f7269162 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -789,6 +789,17 @@ be_util::usage (void) )); ACE_DEBUG (( LM_DEBUG, + ACE_TEXT (" -oE <output_dir>\tOutput directory for the generated ") + ACE_TEXT ("executor files, only when -Gex option is used.") + ACE_TEXT (" Default is current directory\n") + )); + ACE_DEBUG (( + LM_DEBUG, + ACE_TEXT (" -oN\tWhen -Gex option is used, executor files shouldn't be overwritten ") + ACE_TEXT ("if they are already in the output directory.\n") + )); + ACE_DEBUG (( + LM_DEBUG, ACE_TEXT (" -si\t\t\tServer's inline file name ending.") ACE_TEXT (" Default is S.inl\n") )); @@ -905,7 +916,8 @@ be_util::generator_init (void) const char * be_util::get_output_path (bool for_anyop, - bool for_skel) + bool for_skel, + bool for_exec) { if (for_anyop && 0 != be_global->anyop_output_dir ()) { @@ -915,12 +927,46 @@ be_util::get_output_path (bool for_anyop, { return be_global->skel_output_dir (); } + else if (for_exec && 0 != be_global->exec_output_dir ()) + { + return be_global->exec_output_dir (); + } else { return be_global->output_dir (); } } +bool +be_util::overwrite_ciao_exec_files () +{ + bool overwrite = true; + if (be_global->overwrite_not_exec()) + { + bool src_exist = false; + bool hdr_exist = false; + const char *fname_hdr = be_global->be_get_ciao_exec_hdr_fname (false); + FILE* fp_hdr = ACE_OS::fopen(fname_hdr, "r"); + if (fp_hdr) + { + // file exists, don't generate new exec files. + ACE_OS::fclose(fp_hdr); + hdr_exist = true; + } + const char *fname_src = be_global->be_get_ciao_exec_src_fname (false); + FILE* fp_src = ACE_OS::fopen(fname_src, "r"); + if (fp_src) + { + // file exists, don't generate new exec files. + ACE_OS::fclose(fp_src); + src_exist = true; + } + if (hdr_exist && src_exist) + overwrite = false; + } + return overwrite; +} + void be_util::set_arg_seen_bit (be_type *bt) { diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index be4df8c1ce9..5778857cf35 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -308,7 +308,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node) << "PortableServer::POA_var POA = cnt_safe->the_port_POA ();" << be_nl << "::CORBA::Object_var tmp =" << be_idt_nl << "this->get_facet_executor (\"" << port_name << "\");"<< be_uidt_nl << be_nl - << "::CCM_" << lname << "_var tmp_var = "<< global << sname <<"::CCM_" << lname + << global << sname << "::CCM_" << lname << "_var tmp_var = "<< global << sname <<"::CCM_" << lname << "::_narrow (tmp.in());" << be_nl << "::CIAO_FACET" << prefix_connector << scope->flat_name () << "::" << lname diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index da9362998b9..402e55c27cb 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -337,8 +337,8 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & _tao_server_request," << be_nl << "void * /* context */," << be_nl - << "void * _tao_servant" << be_uidt_nl - << ")" << be_uidt_nl; + << "void * _tao_servant)" << be_uidt + << be_uidt_nl; // Generate the actual code for the skeleton. // last argument diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index 4838d0b77ff..59e544b0f13 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -603,6 +603,20 @@ public: /// to be kept. Default is output_dir_. const char* anyop_output_dir (void) const; + /// Set the directory where all the *exec.* files are + /// to be kept. Default is output_dir_. + void exec_output_dir (const char* s); + + /// Get the directory where all the *exec.* files are + /// to be kept. Default is output_dir_. + const char* exec_output_dir (void) const; + + ///Get the flag for not overwriting already existing exec files. + bool overwrite_not_exec (void) const; + + ///Set the flag for not overwriting already existing exec files. + void overwrite_not_exec (bool val); + /// Set any support. void any_support (bool); @@ -1045,6 +1059,14 @@ private: */ char* anyop_output_dir_; + /** + * Directory where all the *exec.* files are to be + * kept. Default value is 0 for this string which means the + * value for output_dir_ is used. + */ + char* exec_output_dir_; + + /// do we support Any operators? bool any_support_; @@ -1206,6 +1228,10 @@ private: bool gen_ciao_exec_impl_; bool gen_ciao_exec_reactor_impl_; + ///Flag to indicate whether generated exec files should + ///overwritten already existing exe files + bool overwrite_not_exec_; + /// False by default, this flag triggers code generation /// for CCM connector implementations. bool gen_ciao_conn_impl_; diff --git a/TAO/TAO_IDL/be_include/be_util.h b/TAO/TAO_IDL/be_include/be_util.h index 26f05ee0bd7..7152e910841 100644 --- a/TAO/TAO_IDL/be_include/be_util.h +++ b/TAO/TAO_IDL/be_include/be_util.h @@ -63,7 +63,14 @@ public: /// Called from various places. static const char * - get_output_path (bool for_anyop, bool for_skel); + get_output_path (bool for_anyop, bool for_skel, bool for_exec); + + static const char * + get_complete_file_name (bool for_exec); + + /// Called from various places. + static bool + overwrite_ciao_exec_files (void); // Called by each node upon construction. static void set_arg_seen_bit (be_type *); diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index 40995028e39..c6e8ba9af75 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -1561,16 +1561,15 @@ is both a client and a server if the server side is handled by a separate thread and the client threads are "pure" clients. When this strategy is set to RW, then also the -ORBFlushingStrategy (which is part of the Resource_Factory) has to be set to <code>blocking</code>.</p> <p> - <CODE>MT_NOUPCALL</CODE> <b>(EXPERIMENTAL!)</b> means use a client connection handler that + <CODE>MT_NOUPCALL</CODE> means use a client connection handler that participates in the leader-follower model like MT, but, like - RW, does not allow handling of nested upcalls within the - waiting thread. Note that with this strategy it is possible + RW, does not allow handling of nested CORBA upcalls within the + waiting thread. It does allow handling of other non CORBA (ACE reactor events) + like timers and ACE notification queue events. Note that with + this strategy it is possible to "run out of threads" in a thread pool, and that TAO doesn't grow thread pools. Unlike RW, this does not require <a href="#ORBTransportMuxStrategy">-ORBTransportMuxStrategy <em>EXCLUSIVE</em></a>. -<!-- -I'm not sure what the affect of AMI on this option is. ---> </p> <p>Default for this option is <em>MT</em>. </p> </td> diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index 604920dad12..bb00c007a0f 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -681,6 +681,21 @@ also receives other options that are specific to it.<p> <td>Default is value of -o option or current directory </td> </tr> + <tr><a name="oE"> + <td><tt>-oE </tt><i>path</i></td> + + <td>Same as -o option but applies only to generated *_exec.* files </td> + <td>Default is value of -o option or current directory </td> + </tr> + + <tr><a name="oN"> + <td><tt>-oN </tt><i>path</i></td> + + <td>Do not overwrite *_exec.* files </td> + <td>When -Gex option is used, executor implementation files shouldn't be overwritten + if they are already in the output directory. </td> + </tr> + <tr><a name="hc"> <td><tt>-hc</tt></td> diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 90a1c4223a7..22ae0b71339 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -67,7 +67,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) } // See whether we need to delete the data block by checking the - // flags. We cannot be happy that we initally allocated the + // flags. We cannot be happy that we initially allocated the // datablocks of the stack. If this method is called twice, as is in // some cases where the same invocation object is used to make two // invocations like forwarding, the release becomes essential. diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index de7f3e18ad4..82e21b6d15b 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -143,7 +143,7 @@ namespace TAO countdown.update (); // For some strategies one may want to release the transport - // back to cache. If the idling is successful let the + // back to cache. If the idling is successful let the // resolver about that. if (transport->idle_after_send ()) this->resolver_.transport_released (); @@ -152,7 +152,7 @@ namespace TAO // here; need to investigate. Client threads would frequently be // canceled sometime during recv_request ... the correct action to // take on being canceled is to issue a CancelRequest message to the - // server and then imediately let other client-side cancellation + // server and then immediately let other client-side cancellation // handlers do their jobs. // // In C++, that basically means to unwind the stack using almost diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 5a768714b81..52f6976eb38 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -244,14 +244,14 @@ namespace TAO * - Minimize locking and copying overhead when trying to attack the * above. * - * <H3> Parsing messages (GIOP) & processing the message:</H3> + * <H3>Parsing messages (GIOP) & processing the message:</H3> * * The messages should be checked for validity and the right * information should be sent to the higher layer for processing. The * process of doing a sanity check and preparing the messages for the * higher layers of the ORB are done by the messaging protocol. * - * <H3> Design forces and Challenges </H3> + * <H3>Design forces and Challenges </H3> * * To keep things as efficient as possible for medium sized requests, * it would be good to minimize data copying and locking along the @@ -293,7 +293,7 @@ namespace TAO * message from the queue and processes that. Once the queue * is drained the last thread resumes the handle. * - * <H3> Sending Replies </H3> + * <H3>Sending Replies </H3> * * We could use the outgoing path of the ORB to send replies. This * would allow us to reuse most of the code in the outgoing data @@ -304,7 +304,7 @@ namespace TAO * Reactor could potentially handle other messages (incoming or * outgoing) and the stack starts growing leading to crashes. * - * <H4> Solution to the nesting problem </H4> + * <H4>Solution to the nesting problem </H4> * * The solution that we (plan to) adopt is pretty straight * forward. The thread sending replies will not block to send the diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index 94eeef24060..ba7ebd62068 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -58,7 +58,7 @@ public: /** * Unbind the dispatcher, the client is no longer waiting for the - * request, for example, because the request timedout. + * request, for example, because the request timed out. * The strategy can (must) cleanup any resources associated with the * request. * A later reply for that request should be ignored. diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index 78cf346fce2..527223de5dc 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -25,6 +25,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +class ACE_Event_Handler; ACE_END_VERSIONED_NAMESPACE_DECL TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index 086d101761f..36015fb5a10 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -32,9 +32,9 @@ bool debug = false; class Worker; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("d")); int c; while ((c = get_opts ()) != -1) @@ -92,7 +92,7 @@ ACE_TSS<Worker> *workers_p = 0; int Worker::svc (void) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread starting up.\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Worker thread starting up.\n"))); // Register this worker workers.ts_object (const_cast<Worker*> (this)); int retval = 0; @@ -101,7 +101,7 @@ int Worker::svc (void) retval = this->process_cmd (); } if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread shutting down.\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Worker thread shutting down.\n"))); return retval; } @@ -122,7 +122,7 @@ int Worker::process_cmd (void) ACE_Message_Block *mb = 0; if (this->getq (mb, 0) == -1) { - ACE_ERROR ((LM_ERROR, "Error calling getq: $!\n")); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error calling getq: $!\n"))); // Strangely, message queues return this instead of ETIME if (errno == EWOULDBLOCK || errno == ESHUTDOWN) return 0; @@ -161,7 +161,7 @@ public: virtual int handle_events (ACE_Time_Value * = 0) { if (TAO_debug_level > 10) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Test_Reactor::handle_events\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Test_Reactor::handle_events\n"))); // This is called by client leader threads. Note, the loop here // glosses over the fact that the Leader_Follower code does not // work quite the way we want it to. Namely, this logic: @@ -185,6 +185,11 @@ public: workers->process_cmd (); return 0; }; + + virtual int handle_events (ACE_Time_Value &) + { + return this->handle_events (); + } }; // Our own Resource_Factory for testing purposes. This just returns @@ -242,7 +247,7 @@ public: void complete_event (TAO_Leader_Follower &lf) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Completing event\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Completing event\n"))); this->state_changed (TAO_LF_Event::LFS_SUCCESS, lf); } @@ -337,7 +342,7 @@ public: virtual int execute (Worker* worker) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutdown cmd\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Shutdown cmd\n"))); worker->shutdown (true); return 0; } @@ -360,7 +365,7 @@ public: virtual int execute (Worker*) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing TSS_Assert(%d,%d,%d) cmd\n", + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing TSS_Assert(%d,%d,%d) cmd\n"), elt_count_, clt_count_, leader_available_)); TAO_Leader_Follower &leader_follower = orb_core_->leader_follower (); TAO_ORB_Core_TSS_Resources* tss = orb_core_->get_tss_resources (); @@ -388,7 +393,7 @@ public: virtual int execute (Worker*) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Wait_For_Event cmd\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Wait_For_Event cmd\n"))); int retval = lf_.wait_for_event (&event_, &transport_, 0); // The worker has probably been shutdown in order for the client // leader event loop to exit - reactivate the worker so it from @@ -414,7 +419,7 @@ public: virtual int execute (Worker*) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Cond_Signal cmd\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Cond_Signal cmd\n"))); ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard ,this->cond_.mutex (), 0); return this->cond_.signal (); } @@ -454,7 +459,7 @@ public: virtual int execute (Worker* worker) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Event_Loop_Thread cmd\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Event_Loop_Thread cmd\n"))); TAO_LF_Event_Loop_Thread_Helper elt (lf_, lf_strategy_, 0); while (!worker->shutdown()) worker->process_cmd (); @@ -479,7 +484,7 @@ public: virtual int execute (Worker*) { if (debug) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Set_Upcall_Thread cmd\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Set_Upcall_Thread cmd\n"))); lf_.set_upcall_thread (); return 0; } @@ -509,8 +514,8 @@ void Test_1 (TAO_ORB_Core* orb_core) TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #1 - Simple Event Loop call\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #1 - Simple Event Loop call\n"))); TSS_ASSERT (tss, leader_follower, 0, 0, false); @@ -530,8 +535,8 @@ void Test_2 (TAO_ORB_Core* orb_core) TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #2 - 2 nested Event Loop calls\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #2 - 2 nested Event Loop calls\n"))); TSS_ASSERT (tss, leader_follower, 0, 0, false); @@ -558,8 +563,8 @@ void Test_3 (TAO_ORB_Core* orb_core) TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #3 - 2 nested Event Loop calls with set_upcall_thread\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #3 - 2 nested Event Loop calls with set_upcall_thread\n"))); TSS_ASSERT (tss, leader_follower, 0, 0, false); @@ -587,8 +592,8 @@ void Test_3 (TAO_ORB_Core* orb_core) void Test_4 (TAO_ORB_Core* orb_core) { TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #4 - Simple Client Leader thread\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #4 - Simple Client Leader thread\n"))); // Activate a thread Worker wrk1; @@ -626,8 +631,8 @@ void Test_4 (TAO_ORB_Core* orb_core) void Test_5 (TAO_ORB_Core* orb_core) { TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #5 - 2 nested Client Leader calls\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #5 - 2 nested Client Leader calls\n"))); // Activate a thread Worker wrk1; @@ -687,8 +692,8 @@ void Test_5 (TAO_ORB_Core* orb_core) void Test_6 (TAO_ORB_Core* orb_core) { TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #6 - 2 nested Client Leader calls with set_upcall_thread\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #6 - 2 nested Client Leader calls with set_upcall_thread\n"))); // Activate a thread Worker wrk1; @@ -752,8 +757,8 @@ void Test_6 (TAO_ORB_Core* orb_core) void Test_7 (TAO_ORB_Core* orb_core) { TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #7 - Client Leader yields to another client thread\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #7 - Client Leader yields to another client thread\n"))); // Activate a thread Worker wrk1; @@ -821,8 +826,8 @@ void Test_8 (TAO_ORB_Core* orb_core) { TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #8 - client becomes leader when event thread dispatched\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #8 - client becomes leader when event thread dispatched\n"))); // Activate a thread Worker wrk1; @@ -886,8 +891,8 @@ void Test_9 (TAO_ORB_Core* orb_core) { TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #9 - Client Leader thread yields to Event Loop thread\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #9 - Client Leader thread yields to Event Loop thread\n"))); // Activate a thread Worker wrk1; @@ -967,8 +972,8 @@ void Test_10 (TAO_ORB_Core* orb_core ) { TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); - ACE_DEBUG ((LM_DEBUG, "==========\n")); - ACE_DEBUG ((LM_DEBUG, "TEST #10 - ET1437460\n")); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #10 - ET1437460\n"))); // This scenario involves: // - an event loop thread |