diff options
Diffstat (limited to 'TAO/docs')
30 files changed, 111 insertions, 1001 deletions
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html index cde897c4245..881f8e4804f 100644 --- a/TAO/docs/ORBEndpoint.html +++ b/TAO/docs/ORBEndpoint.html @@ -345,31 +345,6 @@ that should be put into generated IORs. </TD> </TR> - <TR> - <TD> - <CODE>reuse_addr</CODE> - </TD> - <TD> - <CODE>TAO 1.4.8</CODE> - </TD> - <TD> - Available in IIOP & SSLIOP the <CODE>reuse_addr</CODE> option allows one to - set the SO_REUSEADDR socket option on an endpoint. Doing so bypasses - the TCP TIME_WAIT and can be used to open an endpoint - on a port still in TIME_WAIT state. Use caution using this option. Its not - recommended for the general use-case. Setting - SO_REUSEADDR has been observed to cause unexpected side-effects on some - platforms (e.g. Solaris 5.7 x86 allows programs run as same or different - users to bind to the same port when SO_REUSEADDR is set by all users). - <P> - The format for <CODE>ORBEndpoint</CODE> with the - <CODE>reuse_addr</CODE> option is: - <BLOCKQUOTE> - <CODE>-ORBEndpoint iiop://[</CODE><I>local_hostname</I><CODE>]:</CODE><I ->port</I><CODE>/reuse_addr=[0|1]</CODE> - </BLOCKQUOTE> - </TD> - </TR> </TABLE> <P> @@ -594,7 +569,6 @@ <LI><CODE>-ORBEndpoint diop://1.1@:1234</CODE> </UL> - <hr> <P> <h2><A NAME="SSLIOP">SSLIOP Endpoints</A></h2> TAO's SSLIOP pluggable protocol facilitates CORBA request diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index 4046ebd5ede..b69858a70a4 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -251,12 +251,6 @@ named <code>"svc.conf"</code> in the current directory. </td> passed to the Service Configurator. You can pass multiple of these options on the same command-line. </td> </tr> - <tr> - <td><code>-ORBServiceConfigLoggerKey</CODE> <em>logger key</em></t - <TD>Set the logger key in the <code>ACE_Service_Config</code> - framework. Equivalent to the <code>-k</code> option on the ACE - service configurator class. - </td> </tbody> </table> </p> @@ -1165,16 +1159,6 @@ the ORB uses. The default reactor is the ACE_TP_Reactor. <td>Use the <code>ACE_TP_Reactor</code>, a select based thread-pool reactor which is the default.</td> </tr> - <tr> - <td><code>dev_poll</code></td> - <td>Use the <code>ACE_Dev_Poll_Reactor</code>, a - <code>/dev/poll</code> or Linux <code>sys_epoll()</code> - based thread-pool reactor. It is intended to be a - highly scalable replacement for the - <code>select()</code> based reactors. The - ACE_Dev_Poll_Reactor is currently only supported on - HP-UX, Solaris and Linux.</td> - </tr> </tbody> </table> </td> diff --git a/TAO/docs/Security/Download.html b/TAO/docs/Security/Download.html index 72b8595cd68..18071bab60a 100644 --- a/TAO/docs/Security/Download.html +++ b/TAO/docs/Security/Download.html @@ -73,7 +73,7 @@ function MM_nbGroup(event, grpName) { //v3.0 by the BXA from this US site.</p> <h3>TAO CORBA Security Service Software</h3> <ul> - <li><a href="http://download.dre.vanderbilt.edu"> TAO: The ACE + <li><a href="http://deuce.doc.wustl.edu/Download.html"> TAO: The ACE ORB</a> (TAO's CORBA Security Service is now shipped with the main TAO distribution)</li> </ul> <h3>Cryptographic Software</h3> diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index 7f761398266..c63d65f02d2 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -373,7 +373,7 @@ also receives other options that are specific to it.<p> <td><tt>include_guard=</tt><i>define</i></td> <td>The compiler will generate code the define in the C.h file to prevent - users from including the generated C.h file. Useful for regenerating + users from including the generated C.h file. Useful for regenerating the pidl files in the archive.</td> </tr> @@ -592,6 +592,13 @@ also receives other options that are specific to it.<p> <td> </td> </tr> + <tr><a name="st"> + <td><tt>-st</tt></td> + + <td>Server's template inline file name ending. Default is "S_T.inl".</td> + <td> </td> + </tr> + <tr><a name="t"> <td><tt>-t</tt></td> @@ -642,7 +649,9 @@ also receives other options that are specific to it.<p> <tr><a name="Ge flag"> <td><tt>-Ge </tt><i>flag</i></td> - <td>If the + <td>If the value of the flag is 0, operations generated from application IDL will + use native C++ exceptions. If the value of the flag is 1, such operations will + use the <CODE>CORBA::Environment</CODE> variable for passing exceptions. If the value of the flag is 2, the C++ 'throw' keyword will be used in place of ACE_THROW_SPEC, ACE_THROW, and ACE_RETHROW (ACE_THROW_RETURN and TAO_INTERCEPTOR_THROW will still be used). This flag value will also disable @@ -653,9 +662,7 @@ also receives other options that are specific to it.<p> generated code, but they now expand to nothing and are no longer maintained. Soon they will be removed altogether, and at that point, no throw, throw spec, or environment macros will be generated by the IDL compiler, regardless of the - value of the -Ge flag. - As of TAO 1.5.5 support for emulated exceptions has been removed from - the IDL compiler.</td> + value of the -Ge flag.</td> </tr> <tr><a name="Gp"> @@ -705,15 +712,6 @@ also receives other options that are specific to it.<p> or a valuetype never are - neither case is affected by this option.</td> </tr> - <tr><a name="Gse"> - <td><tt>-Gse</tt></td> - - <td>Generate explicit export of sequence's template base class</td> - <td>Occasionally needed as a workaround for a bug in Visual Studio - (.NET 2002, .NET 2003 and Express 2005) where the template - instantiation used for the base class isn't automatically exported</td> - </tr> - <tr> <td><tt>-GI</tt></td> @@ -880,8 +878,8 @@ also receives other options that are specific to it.<p> <td><tt>-Sorb</tt></td> <td>Suppress generation of the ORB.h include.</td> - <td>This option is useful when regenerating pidl files in the core - TAO libs to prevent cyclic includes;</td> + <td>This option is usefull when regenerating pidl files in the core + TAO libs to prevent cyclic includes;</td> </tr> </table> <P> diff --git a/TAO/docs/dynany/index.html b/TAO/docs/dynany/index.html index b49065a51fa..213d70799e6 100644 --- a/TAO/docs/dynany/index.html +++ b/TAO/docs/dynany/index.html @@ -23,7 +23,7 @@ Point of contact: <a href="mailto: parsons@cs.wustl.edu">Jeff Parsons</a> -<p>Last Update: November 28, 2006 </p> +<p>Last Update: June 11, 2001 </p> </center> @@ -81,7 +81,13 @@ Point of contact: <a href="mailto: parsons@cs.wustl.edu">Jeff Parsons</a> <ul> <li><p>Implementation of dynamic any classes for value types, boxed value - types. + types, and fixed types, as these types themselves are implemented + in TAO (value types are partially implemented, but the implementation + does not include Any insertion/extraction operators or type codes). + </p></li> + + <li><p>Implementation of get and insert operations for abstract interfaces, + when abstract interfaces themselves are implemented in TAO. </p></li> </ul> @@ -111,15 +117,5 @@ Point of contact: <a href="mailto: parsons@cs.wustl.edu">Jeff Parsons</a> <li><p>Expansion of existing dynamic any tests to included the added functionality. </p></li> - <li><p>Implementation of spec defined insert_*_seq() and get_*_seq(), - which are defined for all basic IDL types, and - implemententation of get_abstract() and insert_abstract(). - </p></li> - - <li><p>Dynamic Any source code has been refactored to make more use - of C++ templates, made possible by the dropping of ACE+TAO - support for C++ compilers with poor template support. - </p></li> - </ul> diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html index efceece9965..382ea349b64 100644 --- a/TAO/docs/ec_options.html +++ b/TAO/docs/ec_options.html @@ -97,9 +97,11 @@ struct RtecEventData <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Null_Factory.h</code> and <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h</code> for details. - </ul> +</ul> + The + table below describes all of the options (and values) supported by + these factories. </P> - <h3>Special Topic: Queue Configuration</h3> <p> In certain configurations such as <em>mt</em> and <em>tpc</em>, @@ -163,10 +165,6 @@ static EC_QueueFullSimpleActions "[wait | discard]" # (see below) to specify that object's service configurator tag. </PRE> - <p> - The - table below describes all of the options (and values) supported by - these factories. <P>All the event service factory options start with <CODE>-EC</CODE></P> @@ -208,27 +206,6 @@ static EC_QueueFullSimpleActions "[wait | discard]" <b>Does not apply to the <em>tpc</em> factory.</b> </TD> </TR> - <!-- <TR NAME="ECDispatchingThreadFlags"> --> - <TR> - <td><code>-ECDispatchingThreadFlags</code> - <em>thread_flags</em><b>:</b><em>thread_priority</em> - </td> - <td> - Provide flags and priority used for creation of - dispatching threads.<br> - <em>thread_flags</em> is a set of - <code>THR_</code> flags separated by the vertical bar - ('|'), e.g., - <code>THR_BOUND|THR_NEW_LWP|THR_SCOPE_SYSTEM</code>. - <br> - <em>thread_priority</em> is a numeric value indicating the - desired priority at which the thread should be created. - No range checking is performed on the value prior to - passing to the thread creation function. Also note that - priorities are platform-specific, so a valid value for a - given set of flags on one platform may not work with the - same flags on another platform. - </tr> <!-- <TR NAME="ECQueueFullServiceObject"> --> <tr> diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html index 7c03e93e967..7119f953b6a 100644 --- a/TAO/docs/libraries.html +++ b/TAO/docs/libraries.html @@ -28,7 +28,7 @@ straightforward way to get the features you need. <H3> List of Libraries </H3> Here we outline the list of libraries in TAO core with the list of <a -href="../../MPC/docs/README"> MPC </a> projects that can be used by the +href="../../MPC/README"> MPC </a> projects that can be used by the application to get all the required libraries linked into the application. The library names in table below are the ones created on UNIX based systems. Windows systems have a slightly different naming @@ -103,7 +103,7 @@ and the dependencies outlined below are the same. <P> <td>Support for the TAO-specific Endpoint Policy. This is used to set up constraints on endpoints placed in IORs. The endpoint policy is applied to a POAManager via the POAManagerFactory and - affects all POAs associated with that manager. Examples of use + affects all POAs associated with that mananger. Examples of use are in $TAO_ROOT/tests/POA/EndpointPolicy. Applications have to <code> #include "tao/EndpointPolicy/EndpointPolicy.h" </code> to get the right symbols.</td> @@ -181,18 +181,18 @@ and the dependencies outlined below are the same. <P> </tr> <tr align=left> <th>libTAO_PI.so</th> - <td>Support for Portable Interceptors. This library is automagically + <td>Support for Portalbe Interceptors. This library is automagically loaded by the ORB when the application uses the PolicyFactory or ORBInitializer . Just linking this library should be sufficient to get all the features that are required to write applications - using portable interceptors. </td> + using portable intercetpros. </td> <td>pi.mpb</td> </tr> <tr align=left> <th>libTAO_PortableServer.so</th> <td>Support for POA. This library is automagically loaded by - the ORB when the application calls resolve_initial_references + the ORB when the application calls resolve_intial_references ("RootPOA"); Just linking this library should be sufficient to get all the features that are required to write powerful servers. </td> @@ -272,45 +272,6 @@ and the dependencies outlined below are the same. <P> </td> <td>csd_threadpool.mpb</td> </tr> - <tr align=left> - <th>libTAO_TC.so</th> - <td>Support for TAO::Transport::Current - a generic fremework for aplications that - need access to statistical information about the currently used Transport. See <a - href="transport_current/index.html"> Transport::Current</a>. - This library can be loaded statically or dynamically. Applications are required to - <code> #include "tao/TransportCurrent/Transport_Current.h" - </code> for static loading. - </td> - <td>tc.mpb</td> - </tr> - <tr align=left> - <th>libTAO_TC_IIOP.so</th> - <td>Support for TAO::Transport::IIOP::Current - an IIOP-specific plug-in for - Transport::Current. See <a href="transport_current/index.html"> Transport::Current</a>. - This library can be loaded statically or dynamically. - Applications are required to <code> #include "tao/TransportCurrent/IIOP_Transport_Current.h" - </code> for static loading. Depends on libTAO_TC.so. - </td> - <td>tc_iiop.mpb</td> - </tr> - <tr align=left> - <th>libTAO_Compression.so</th> - <td>Support for Compression. This library can - be loaded statically or dynamically. Applications are required to - <code> #include "tao/Compression/Compression.h" - </code> for static loading. - </td> - <td>compression.mpb</td> - </tr> - <tr align=left> - <th>libTAO_ZlibCompressor.so</th> - <td>Support for Zlib Compression. This library can - be loaded statically or dynamically. Applications are required to - <code> #include "tao/Compression/zlib/ZlibCompressor.h" - </code> for static loading. - </td> - <td>zlibcompressor.mpb</td> - </tr> </tr> </table> diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index 0fc2730415e..a177128c052 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -189,15 +189,15 @@ Notification Service <b>CCM Related</b> <br><BR> <li> -<a href="../../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li> +<a href="../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li> <li> -<a href="../../../CIAO/docs/releasenotes/dance.html">Deployment and +<a href="../../CIAO/docs/releasenotes/dance.html">Deployment and Configuration Engine (DAnCE)</a></li> <li> -<a href="../../../CIAO/CIDLC/README.html">Component Implementation +<a href="../../CIAO/CIDLC/README.html">Component Implementation Definition Language Compiler (CIDLC)</a></li> <li> -<a href="../../../CIAO/docs/static_ciao_contents.html">Static Configuration +<a href="../../CIAO/docs/static_ciao_contents.html">Static Configuration Support for Real-Time Platforms</a></li> </ul> </td> @@ -285,7 +285,7 @@ WFMO_Reactor_Test, Timer_Cancellation_Test</ul> <h3> <a NAME="idl"></a>IDL Compiler</h3> Point of contact: <a href="mailto:j.parsons@vanderbilt.edu">Jeff Parsons</a> -<p>Current status: (As of November 13, 2006.) +<p>Current status: (As of May 4, 2006.) <ul> <li> Generated code closely follows the C++ Mapping specified in the latest @@ -659,7 +659,7 @@ in a directory different from that where the other generated files are created.</li> <li> -Generation of explicit template instantiations has been completely +Generation of explicit template instantiations has been completely removed, it is no longer available via the command line option -GT.</li> <li> @@ -673,19 +673,6 @@ Added new command line option -oS to specify output directory for all skeleton files, including TIE class files, if generated. Overrides -o option value, if any.</li> -<li> -Uninlined all generated TIE class code, since inlining could potentially -cause a problem for RTTI.</li> - -<li> -Added new command line option <tt>-Gse</tt> that causes generation of -an explicit export of each sequence's template base class. This is -occasionally necessary as a workaround for a bug in Visual Studio -(.NET 2002, .NET 2003 and Express 2005) where the template instantiation -used for the base class isn't automatically exported. See -<a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;309801"> -KB 309801</a> for more info</li> - </ul> <h4> @@ -708,9 +695,7 @@ have been found. One is to change the declaration of foo to be <p>and this has been done in all cases we could find in the IDL compiler source code. Another way to avoid the problem is to change the Release project Optimization setting to 'Minimize Size'. Reportedly the problem -has been fixed in MSVC version 7.0. - -</ul> +has been fixed in MSVC version 7.0.</ul> <h4> Future work:</h4> @@ -1455,7 +1440,7 @@ Point of contact: <a href="mailto:pradeep@cs.wustl.edu">Pradeep Gore</a> <br>The different command line and service configurator options used for configuring the CORBA event services are located <A href="../cec_options.html"> here</a>. This implementation is based on -the Real Time Event service. +the Real Time Event service. <h3> Features in this release:</h3> @@ -1544,18 +1529,18 @@ Notify_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/Notify_Logging_Serv RTEvent_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/RTEvent_Logging_Service</tt></li></ul> <li> -Each service registers with the Naming Service as -"BasicLogFactory", "EventLogFactory", "NotifyLogFactory" and +Each service registers with the Naming Service as +"BasicLogFactory", "EventLogFactory", "NotifyLogFactory" and "RTEventLogFactory" respectively.</li> <li> -Each service registers with the Interoperable Naming Service as -"BasicLogService", "EventLogService", "NotifyLogService" and +Each service registers with the Interoperable Naming Service as +"BasicLogService", "EventLogService", "NotifyLogService" and "RTEventLogService" respectively.</li> <li> -The Log Service uses a dynamically loaded "plug-in" Strategy for storing and -querying log records. The default Strategy stores Log records in memory and +The Log Service uses a dynamically loaded "plug-in" Strategy for storing and +querying log records. The default Strategy stores Log records in memory and supports the Extended Trader Constraint Language (ETCL) Query Language.</li> <li> @@ -2375,7 +2360,7 @@ Current Status:</h4> <p>A concrete CSD Strategy implementation has also been added to serve as a "reference implementation". This is being called the CSD Thread Pool Strategy (TP_Strategy). The TP_Strategy provides a means to decouple the threads (ORB threads) that receive requests from the underlying transport from the thread that will ultimately dispatch the request to the target servant object. The TP_Strategy implements a "request queue" as the integral part of the mechanism that allows an ORB thread to "hand-off" a request to one of the TP_Strategy object's worker threads. The TP_Strategy reference implementation is provided as an example of how concrete CSD Strategy could be implemented. <p>Two approaches are supported for applying CSD strategy to an application. <ol> -<li>Explicitly calling CSD interfaces. +<li>Explicitly calling CSD interfaces. <p>Here is an example application code showing how a TP_Strategy object can be created and applied to a POA: <pre> @@ -2392,7 +2377,7 @@ Current Status:</h4> csd_strategy->set_servant_serialization (false); // Tell the strategy to apply itself to the poa. - if (csd_strategy->apply_to(poa.in()) == false) + if (csd_strategy->apply_to(poa.in()) == false) { ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to the poa.\n")); return -1; @@ -2400,7 +2385,7 @@ Current Status:</h4> </pre> <li>Service Configurator - <p>The format of the CSD specific parameters for creating the TP_Strategy service object is: + <p>The format of the CSD specific parameters for creating the TP_Strategy service object is: <pre>-CSDtp <poa_name>:<csd_thread_number>:[OFF]</pre> <p>The last portion of the parameter is the servant serialization flag. It's only needed when the servant serialization needs be turned off, otherwise the servant serialization is always on. When servant serialization is on (the default), the TP_Strategy will serialize requests to any particular servant. Requests to different servant objects can occur in parallel, but requests to any particular servant will be dispatched serially (ie, one at a time). @@ -2408,8 +2393,8 @@ Current Status:</h4> <p>Here is an example of the svc.conf file. <pre> - dynamic TAO_CSD_TP_Strategy_Factory Service_Object * - TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2" + dynamic TAO_CSD_TP_Strategy_Factory Service_Object * + TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2" </pre> </ol> </ul> @@ -2463,16 +2448,16 @@ online</a>.<P> Point of contact: <a href="mailto:mcorino@remedy.nl">Martin Corino</a>, Remedy IT. -<p>TAO has support for IPv6 for IIOP under Windows and Linux. +<p>TAO has support for IPv6 for IIOP under Windows and Linux. To use this, add <code>ipv6</code> to your <code>default.features</code> file and regenerate all makefiles. When using the automated tests, add IPV6 to the configs. <p> Finished work: -<li>Added IPv6 support to all IIOP related classes (parsers, connectors, +<li>Added IPv6 support to all IIOP related classes (parsers, connectors, acceptors)</li> <li>Added IPv6 support to corbaloc and mcast URL parsers.</li> -<li>Implemented IPv6 support in the TAO_IOR_MCast utility class from TAO Svc +<li>Implemented IPv6 support in the TAO_IOR_MCast utility class from TAO Svc Utils</li> <p> @@ -2480,7 +2465,7 @@ The following gotchas are known: <li>In a localhost situation connecting a server listening at the IPv6 ANY address has the following problems: On Linux this does not work when the client tries to connect to a - LinkLocal address of one the local NICs, + LinkLocal address of one the local NICs, on Windows this only works (locally) by using the 'localhost' address (either IPv4 or IPv6) </li> @@ -2493,8 +2478,8 @@ on Windows this only works (locally) by using the 'localhost' address (either <p> Future work: -<li>IPv6 support for other protocols/strategies than IIOP (i.e. SHMIOP, UIOP, - SCIOP, SSLIOP etc.; for this we excluded some regression tests in IPv6 builds for this +<li>IPv6 support for other protocols/strategies than IIOP (i.e. SHMIOP, UIOP, + SCIOP, SSLIOP etc.; for this we excluded some regression tests in IPv6 builds for this reason)</li> <li>IPv4 runtime dependencies in various CORBA services (f.i. Event service) diff --git a/TAO/docs/transport_current/index.html b/TAO/docs/transport_current/index.html deleted file mode 100644 index 40067cbdc35..00000000000 --- a/TAO/docs/transport_current/index.html +++ /dev/null @@ -1,488 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> - -<!-- $Id:$ --> - -<HTML> -<HEAD> -<TITLE>Using the TAO::Transport::Current Feature</TITLE> - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> - -<LINK REL="STYLESHEET" HREF="transport_current.css"> - -</HEAD> - -<BODY TEXT = "#000000" LINK="#000fff" VLINK="#ff0f0f" BGCOLOR="#ffffff"> - -<P> - -<H1 ALIGN="CENTER">Using the TAO::Transport::Current Feature</H1> - - -<P ALIGN="CENTER"> -Object Computing Inc.<BR> -St.Louis, Missouri -</P> - -<P ALIGN="CENTER"> -<SMALL><STRONG> -<A HREF="mailto:iliyan@ociweb.com">Iliyan Jeliazkov</A> -<A HREF="mailto:mesnier_p@ociweb.com">Phil Mesnier</A> - and <A HREF="mailto:<john_c@ociweb.com">Ciju John</A> -</STRONG></SMALL> -</P> - -<HR> - -<P> -<H3>Scope and Context</H3><P> - -<P>In TAO, it is just too hard to obtain statistical or pretty much any operational information about the network transport which the ORB is using. While this is a direct corollary of the CORBA's design paradigm which mandates hiding all this hairy stuff behind non-transparent abstractions, it also precludes effective ORB and network monitoring. -</P> - -<P> -The Transport::Current feature intends to fill this gap by defining a -framework for developing a wide range of solutions to this problem. It also provides a basic implementation for the most common case - the IIOP transport. -</P> - -<P> -By definition, transport-specific information is available in -contexts where the ORB has selected a Transport:</P> - -<UL> - <LI>Within Client-side interception points;</LI> - <LI>Within Server-side interception points;</LI> - <LI>Inside a Servant up-call</LI> -</UL> - -<P> -The implementation is based on a generic service-oriented -framework, implementing the TAO::Transport::Current interface. It is -an optional service, which can be dynamically loaded. This service makes -the Transport::Current interface available through -orb->resolve_initial_references() . The basic idea is that whenever a Transport is -chosen by the ORB, the Transport::Current (or a derivative) will have access -to that instance and be able to provide some useful information. -</P> - -<BR><HR> - - -<P> -<H3> -Programmer's Reference -</H3> - -<P> -Consider the following IDL interface, describing a Factory for -producing TAO::Transport::Traits instance, which represents -transport-specific data. -</P> - -<PRE> -#include <IOP.pidl> -#include <TimeBase.pidl> - -module TAO -{ - /// A type used to represent counters - typedef unsigned long long CounterT; - - module Transport - { - /// Used to signal that a call was made within improper invocation - /// context. Also, this exception is thrown if no Transport has - /// been selected for the current thread, for example in a - /// collocated invocation. - - exception NoContext - { - }; - - // The primary interface, providing access to Transport - // information, available to the current thread. - - local interface Current - { - /// Transport ID, unique within the process. - readonly attribute long id raises (NoContext); - - /// Bytes sent/received through the transport. - readonly attribute CounterT bytes_sent raises (NoContext); - readonly attribute CounterT bytes_received raises (NoContext); - - /// Messages (requests and replies) sent/received using the current - /// protocol. - readonly attribute CounterT messages_sent raises (NoContext); - readonly attribute CounterT messages_received raises (NoContext); - - /// The absolute time (miliseconds) since the transport has been - /// open. - readonly attribute TimeBase::TimeT open_since raises (NoContext); - }; - }; -}; -</PRE> - -<P> -As an example of a specialized Transport::Current is the Transport::IIOP::Current, which derives from Transport::Current and has an interface, described in the following IDL: -</P> - -<PRE> -#include "TC.idl" - -/// Provide a forward reference for the SSLIOP::Current -module SSLIOP -{ - interface Current; -}; - - -module TAO -{ - module Transport - { - module IIOP - { - // The primary interface, providing access to IIOP-specific - // transport information, if it is indeed an IIOP (-like) transport - // that has been selected. - - local interface Current : TAO::Transport::Current - { - /// Remote host - readonly attribute string remote_host raises (NoContext); - - /// Remote port Using long (signed) type to better accomodate - /// the Java mapping, which has no support for unsigned values - readonly attribute long remote_port raises (NoContext); - - /// Local host - readonly attribute string local_host raises (NoContext); - - /// Local port - readonly attribute long local_port raises (NoContext); - - /// If this is a "secure" transport, this method will give you - /// the corresponding SSLIOP::Current - readonly attribute ::SSLIOP::Current ssliop_current raises (NoContext); - }; - }; - }; -}; -</PRE> - - -<P> -<H3> -User's Guide -</H3> - -<P> -The TAO::Transport::Current can be used as a base interface for a more specialized TAO::Transport::X::Current. It is not required, however that a more specialized Current inherits from it. -</P> - -<P> -Typical, generic usage is shown in the -$TAO_ROOT/orbsvcs/tests/Transport_Current/Framework test: -</P> - -<PRE> -... - // Get the Current object. - ::CORBA::Object_var tcobject = - orb->resolve_initial_references ("TAO::Transport::Current" - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - ::TAO::Transport::Current_var tc = - ::TAO::Transport::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (CORBA::is_nil (tc.in ())) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) client - ERROR: Could not resolve ") - ACE_TEXT ("TAO::Transport::Current object.\n"))); - - ACE_TRY_THROW (CORBA::INTERNAL ()); - } -... -</PRE> - -<P> -Another example is available from the $TAO_ROOT/orbsvcs/tests/Transport_Current/IIOP test. This fragment shows how to obtain transport-specific information: -</P> - -<PRE> -... - // Get the specific Current object. - CORBA::Object_var tcobject = - orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current") - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - - Transport::IIOP::Current_var tc = - Transport::IIOP::Current::_narrow (tcobject.in () - ACE_ENV_SINGLE_ARG_DECL); - ACE_TRY_CHECK; - - if (CORBA::is_nil (tc.in ())) - ACE_TRY_THROW (CORBA::INTERNAL ()); - - ::CORBA::String_var rhost (tc->remote_host (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; - - ::CORBA::String_var lhost (tc->local_host (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; - - ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; -... -</PRE> - - - -<P> -<H3> -Configuration, Bootstrap, Initialization and Operation -</H3> - -<P> -To use the Transport Current features the framework must be loaded -through the Service Configuration framework. For example, using -something like this: -</P> - -<PRE> -dynamic TAO_Transport_Current_Loader Service_Object * libTAO_Transport_Current.so:_make_TAO_Transport_Current_Loader() "" -</PRE> - -<P> -The Transport_Current_Loader service uses an ORB initializer to register the "TAO::Transport::Current" name in a way that allows it to be resolved via orb->resolve_initial_references(). The implementation is the TAO::Transport::Current_Impl class. -</P> - -<P> -A transport-specific Traits_Factory objects are loaded like this: -</P> - -<PRE> -... -dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() "" -... -</PRE> - -<P> -Note that any number of transport-specific Current interfaces may be available at any one time. -</P> - -<P> -Whenever a Transport::Current method is invoked, a pointer to the currently selected Transport instance must be accessible through Thread Specific Storage (TSS). For each thread, this is managed by modifying the TAO classes, instances of which are created on the stack during request/response processing. -</P> - -<P> -<H3> -Implementation and Required Changes -</H3> - -<P> -The primary implementation is predicated upon usage of thread specific -storage (TSS) and the guarantees C++ provides for calling the -constructor and the destructor of automatic (stack-based) -objects. Some existing objects, used in TAO will have to be modified -and the necessary changes, both for client and the server side are -detailed below. -</P> - -<H4> -Client Side: Sending Requests or Replies -</H4> - - -<P> -The Profile_Transport_Resolver instance contains the reference to the -Transport, which is the TAO implementation structure that is needed to extract -any protocol-specific information. An -instance of Profile_Transport_Resolver lives on the stack, starting -inside a call to Invocation_Adapter::invoke_remote_i(), or -LocateRequest_Invocation_Adapter::invoke(). In the case of collocated -invocations no such object is created. -</P> - -<P> -It is then passed around the calls that follow, except for the calls -to the following Invocation_Base methods: send_request_interception(), -receive_other_interception(), receive_reply_interception(), -handle_any_exception(), handle_all_exception(); -</P> - -<P> -Note that these in turn call the client-side interception points and -that is where information about the transport will be needed. In order -to make the transport information accessible inside those methods, we -changed Profile_Transport_Resolver and the TAO_ServerRequest classes to - incorporate an additional member: -</P> - -<PRE> -... -TAO::Transport_Selection_Guard transport_; -... -</PRE> - - -<P> -This guard automatically keeps track of the currenty selected Transport from within its constructor and destructor. The rest of the TC framework makes sure this pointer is stored in a thread-specific storage, by adding an additional member to TSS_Resources: -</P> - -<PRE> -... -TAO::Transport_Selection_Guard* tsg_; -... -</PRE> - -<P> -The idea is to keep a pointer to the last guard on the current thread. Each guard keeps a pointer to the previous, effectively creating a stack of transport selection guards. The stack structure ensures both that the selection/deselection of a Transport will be correctly handled. It also ensures that, in case the current thread temporarily changes the Transport, the previous “current” transport will be preserved, no matter how many times such change occurs. A good example for this is a nested up-call scenario. -</P> - -<P> -Inside an interceptor, one can use the methods from Transport Current to obtain information on the currently selected transport. The implementation simply looks up the TAO_Transport pointer via TSS_Resources::tsg_ and obtains the requested data. -</P> - - - -<H4> -Server Side: Request Processing -</H4> - - -<P> -On the server side, the TAO_ServerRequest instance already has a -Transport pointer. The TAO_ServerRequest lives on the stack, starting -its life inside a call to TAO_GIOP_Message_Base::process_request(). -</P> - -<P> -Similarly to the client-side, we changed the TAO_ServerRequest -to add a field: -</P> - -<PRE> -... -TAO::Transport_Selection_Guard transport_; -... -</PRE> - -<P> -Operation is similar to the client-side case. In the collocated case there may not be a -transport available, so the TSS slot will be null. -</P> - -<P> -Inside an interceptor then, one can use an RIR-resolved -TransportCurrent to create a specialization of TransportInfo, based on -the kind of Transport used. Then they would _downcast() it to the -specific type. -</P> - -<H3> -Structural and Footprint Impact -</H3> - -<P> -As the IIOP implementation of the Transport Current functionality requires additional -data to be kept about the Transport, we added a new field to TAO_Transport: -</P> - -<PRE> -... - /// Transport statistics - TAO::Transport::Stats* stats_ -... -</PRE> - -<P> -TAO::Transport::Stats is a simple structure, which keeps track of useful statistical -information about how a transport is used: -</P> - -<PRE> -... - class TAO_Export Stats - { - public: - Stats (); - - void messages_sent (size_t message_length); - CORBA::LongLong messages_sent (void) const; - CORBA::LongLong bytes_sent (void) const; - - void messages_received (size_t message_length); - CORBA::LongLong messages_received (void) const; - CORBA::LongLong bytes_received (void) const; - - void opened_since (const ACE_Time_Value& tv); - const ACE_Time_Value& opened_since (void) const; - - private: - CORBA::LongLong messages_rcvd_; // 32bits not enough (?) - CORBA::LongLong messages_sent_; // 32bits not enough (?) - - ACE_Basic_Stats bytes_rcvd_; - ACE_Basic_Stats bytes_sent_; - - ACE_Time_Value opened_since_; - }; -... -</PRE> - -<P> -To gather the statistics the TAO_Transport::send_message_shared() and TAO_Transport::process_parsed_messages() must be modified. These are non-virtual methods and are being called as part of request and reply processing regardless of what the most derived Transport type is. This property ensures that any specific Transport will have access to these statistics. -</P> - -<H3> -Performance Impact -</H3> - -<P> -As the implementation of the Transport Current functionality -necessitates some additional processing on the critical path of an -invocation, we are expecting a performance impact when the -functionality is being used. -</P> - -<P> -It is possible at build time, to -disable the functionality, so that applications only incur the penalty -if they require it. The ORB, by default will not support the Transport Current functionality. -Use the following #define (in your config.h file) to enable it: -</P> - -<PRE> -#define TAO_HAS_TRANSPORT_CURRENT 1 -</PRE> - -<H3> -Example Code -</H3> - -<P> -Look at $TAO_ROOT/orbsvcs/tests/Transport_Current for code which illustrates and tests this feature. -</P> -</BODY> -</HTML> diff --git a/TAO/docs/transport_current/transport_current.css b/TAO/docs/transport_current/transport_current.css deleted file mode 100644 index 1993b851311..00000000000 --- a/TAO/docs/transport_current/transport_current.css +++ /dev/null @@ -1,31 +0,0 @@ - -/* Century Schoolbook font is very similar to Computer Modern Math: cmmi */ -.MATH { font-family: "Century Schoolbook", serif; } -.MATH I { font-family: "Century Schoolbook", serif; font-shape: italic } -.BOLDMATH { font-family: "Century Schoolbook", serif; font-weight: bold } - -/* implement both fixed-size and relative sizes */ -SMALL.XTINY { font-size : xx-small } -SMALL.TINY { font-size : x-small } -SMALL.SCRIPTSIZE { font-size : smaller } -SMALL.FOOTNOTESIZE { font-size : small } -SMALL.SMALL { } -BIG.LARGE { } -BIG.XLARGE { font-size : large } -BIG.XXLARGE { font-size : x-large } -BIG.HUGE { font-size : larger } -BIG.XHUGE { font-size : xx-large } - -/* heading styles */ -H1 { } -H2 { } -H3 { } -H4 { } -H5 { } - -/* mathematics styles */ -DIV.displaymath { } /* math displays */ -TD.eqno { } /* equation-number cells */ - - -/* document-specific styles come next */ diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am index 8b2c868579f..06b7f62661a 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am +++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am @@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -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/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = @@ -22,7 +22,6 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS BUILT_SOURCES = \ QuoterC.cpp \ @@ -47,10 +46,10 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc index 8230799791a..b19033fbef3 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc +++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami { custom_only = 1 } -project(*client) : taoexe, portableserver, ami { +project(*client) : taoexe, portableserver, ami, exceptions { after += *idl source_files { client.cpp @@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, ami { } } -project(*server) : taoserver, ami { +project(*server) : taoserver, ami, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am index 59ec0863011..6636df72e21 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am @@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -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/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = ## Makefile.Quoter_Event_Service_Idl.am -if BUILD_EXCEPTIONS - BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -45,14 +43,14 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS - ## Makefile.Quoter_Event_Service_Client.am if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -80,11 +78,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Makefile.Quoter_Event_Service_Server.am if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -115,6 +115,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc index 9d9eb79afc7..a98f1720c63 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc @@ -8,7 +8,7 @@ project(*idl) : taoidldefaults, anytypecode { custom_only = 1 } -project(*client) : orbsvcsexe, portableserver, event, event_skel, naming { +project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions { after += *idl source_files { client.cpp @@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, event, event_skel, naming { } } -project(*server) : orbsvcsexe, portableserver, event, event_skel, naming { +project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Makefile.am b/TAO/docs/tutorials/Quoter/Makefile.am index 83aa0ad74b0..9a0053b5806 100644 --- a/TAO/docs/tutorials/Quoter/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Makefile.am @@ -12,7 +12,6 @@ SUBDIRS = \ AMI \ Event_Service \ On_Demand_Activation \ - RTCORBA \ RT_Event_Service \ idl \ Simple \ diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc index 28cb1412d21..797e2569292 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : orbsvcsexe, portableserver, naming { +project(*client) : orbsvcsexe, portableserver, naming, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : orbsvcsexe, portableserver, naming { } } -project(*server) : orbsvcsexe, portableserver, naming { +project(*server) : orbsvcsexe, portableserver, naming, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am index 4f278eeebf3..29035de8f99 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am @@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -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/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = @@ -22,7 +22,6 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS BUILT_SOURCES = \ QuoterC.cpp \ @@ -47,10 +46,10 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -59,6 +58,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -88,6 +88,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -97,6 +98,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -130,6 +132,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc index d68df58bb9b..650bdc9d832 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami { custom_only = 1 } -project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*client) : taoexe, portableserver, naming, ami, minimum_corba, exceptions { after += *idl source_files { client.cpp @@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, av } } -project(*server) : taoserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*server) : taoserver, naming, ami, minimum_corba, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am deleted file mode 100644 index 4b87d4e87ec..00000000000 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am +++ /dev/null @@ -1,249 +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 TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -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/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -noinst_PROGRAMS = -BUILT_SOURCES = - -## Makefile.RTCORBA_Quoter_Common.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES += \ - DistributorC.cpp \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl - -CLEANFILES += \ - Distributor-stamp \ - DistributorC.cpp \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl - -DistributorC.cpp DistributorC.h DistributorC.inl DistributorS.inl: Distributor-stamp - -Distributor-stamp: $(srcdir)/Distributor.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Distributor.idl - @touch $@ - -BUILT_SOURCES += \ - BrokerC.cpp \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl - -CLEANFILES += \ - Broker-stamp \ - BrokerC.cpp \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl - -BrokerC.cpp BrokerC.h BrokerC.inl BrokerS.inl: Broker-stamp - -Broker-stamp: $(srcdir)/Broker.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Broker.idl - @touch $@ - -BUILT_SOURCES += \ - CommonC.cpp \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl - -CLEANFILES += \ - Common-stamp \ - CommonC.cpp \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl - -CommonC.cpp CommonC.h CommonC.inl CommonS.h CommonS.inl: Common-stamp - -Common-stamp: $(srcdir)/Common.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Common.idl - @touch $@ - -noinst_LTLIBRARIES = libRTCORBA_Quoter_Common.la - -libRTCORBA_Quoter_Common_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DRTCORBA_QUOTER_COMMON_BUILD_DLL - -libRTCORBA_Quoter_Common_la_SOURCES = \ - BrokerC.cpp \ - CommonC.cpp \ - DistributorC.cpp \ - Stock_PriorityMapping.cpp - -noinst_HEADERS = \ - Broker.idl \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl \ - Common.idl \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl \ - Distributor.idl \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl \ - Stock_PriorityMapping.h - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Admin.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Admin - -Admin_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Admin_SOURCES = \ - Admin.cpp - -Admin_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Broker.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Broker - -Broker_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Broker_SOURCES = \ - Broker.cpp \ - BrokerS.cpp \ - Broker_i.cpp \ - CommonS.cpp \ - StockNameConsumer_i.cpp \ - BrokerS.h \ - Broker_i.h \ - StockNameConsumer_i.h \ - Stock_Database.h - -Broker_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Distributor.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Distributor - -Distributor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Distributor_SOURCES = \ - CommonS.cpp \ - Distributor.cpp \ - DistributorS.cpp \ - Distributor_i.cpp \ - DistributorS.h \ - Distributor_i.h \ - Stock_Database.h - -Distributor_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -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/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp index 8fe636bcd96..2e5698c1c71 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp @@ -1,4 +1,3 @@ -// $Id$ // local headers #include "StockNameConsumer_i.h" @@ -24,7 +23,7 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna i < the_stockname->names ().length (); ++i) { - if (ACE_OS::strcmp (this->stock_name_, + if (ACE_OS::strcmp (this->stock_name_, the_stockname->names ()[i]) == 0) { // Get the quoter for the connection from the <context_>. @@ -32,7 +31,7 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna "*** message: getting the quoter connection\n")); Stock::StockQuoter_var quoter = this->context_.get_connection_quoter_info (); - + try { // Request more information from the StockQuoter. @@ -40,10 +39,10 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna "*** message: requesting the stock info from the quoter\n")); Stock::StockInfo_var stock_info = quoter->get_stock_info (the_stockname->names()[i]); - + // Display the current value of the stock. ACE_DEBUG ((LM_DEBUG, - "Current value of %s is $%d\n", + "Current value of %s is $%d\n", stock_info->name.in (), stock_info->last)); } @@ -60,14 +59,14 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna } -::Stock::Cookie * +::Stock::Cookie * Stock_StockNameConsumer_i::cookie () throw (::CORBA::SystemException) { return this->cookie_.in (); } -void +void Stock_StockNameConsumer_i::cookie (::Stock::Cookie *cookie) throw (::CORBA::SystemException) { diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am index f18f6763052..5fcd5c51cc1 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am @@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -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/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = ## Makefile.Quoter_RT_Event_Service_Idl.am -if BUILD_EXCEPTIONS - BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -45,16 +43,16 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS - ## Makefile.Quoter_RT_Event_Service_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -87,6 +85,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -96,6 +95,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -131,6 +131,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc index 9fce32b5ba3..15cb6b2be5b 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, anytypecode { custom_only = 1 } -project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions { after += *idl source_files { client.cpp @@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_mini } } -project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc index 39350e69199..d1f999594f1 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taoexe, portableserver { +project : taoexe, portableserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc index d66ed413d6e..e15b2b37572 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, rtevent, naming { +project(*client) : taoexe, portableserver, rtevent, naming, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver, rtevent, naming { } } -project(*server) : taoserver, rtevent, naming, iortable { +project(*server) : taoserver, rtevent, naming, iortable, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am index 02535fa4295..b66ca814609 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Quoter_Simple_ImprovedServer.am if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = server @@ -42,6 +43,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc index 67da7604b8e..fda3b450dd6 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc @@ -1,5 +1,5 @@ // $Id$ -project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project : taoserver, minimum_corba, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc index 5685980514b..c8c3a2ad4ae 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver { +project(*client) : taoexe, portableserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver { } } -project(*server) : taoserver, avoids_corba_e_micro { +project(*server) : taoserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc index 5cbce4fb41e..dc8789b784c 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taoserver { +project : taoserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am index 8e882c13c78..5670be7df9e 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile.am +++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am @@ -13,14 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -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/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) - ## Makefile.Quoter_Idl_Lib.am -if BUILD_EXCEPTIONS - BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -29,7 +26,8 @@ BUILT_SOURCES = \ QuoterS.h \ QuoterS.inl \ QuoterS_T.cpp \ - QuoterS_T.h + QuoterS_T.h \ + QuoterS_T.inl CLEANFILES = \ Quoter-stamp \ @@ -40,9 +38,10 @@ CLEANFILES = \ QuoterS.h \ QuoterS.inl \ QuoterS_T.cpp \ - QuoterS_T.h + QuoterS_T.h \ + QuoterS_T.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT $(srcdir)/Quoter.idl @@ -67,11 +66,11 @@ noinst_HEADERS = \ QuoterC.inl \ QuoterS.h \ QuoterS.inl \ + QuoterS_T.cpp \ QuoterS_T.h \ + QuoterS_T.inl \ quoter_common_export.h -endif BUILD_EXCEPTIONS - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html index 26c6fc4b8ca..d910ceafd98 100644 --- a/TAO/docs/tutorials/Quoter/index.html +++ b/TAO/docs/tutorials/Quoter/index.html @@ -42,7 +42,7 @@ files for which links are provided. If you choose to build and run the example, however, use the files which are part of the TAO source you <A - HREF="http://download.dre.vanderbilt.edu">download</a>. You can + HREF="http://deuce.doc.wustl.edu/Download.html">download</a>. You can find those source files in <CODE>$TAO_ROOT/docs/tutorials/Quoter</CODE>, where there's also a Makefile to build them with. Downloading the files individually from these links may result in source that does not build |