diff options
Diffstat (limited to 'TAO/docs')
28 files changed, 98 insertions, 146 deletions
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html index 9879190f110..0ccd0c52522 100644 --- a/TAO/docs/ORBEndpoint.html +++ b/TAO/docs/ORBEndpoint.html @@ -174,7 +174,7 @@ <P> where <CODE>1234</CODE> is the TCP port the endpoint will be opened on. In this case, an endpoint will be opened on the - network interface associated with the hostname <CODE>foo2</CODE> + network interface associated with the hostname <CODE>foo1</CODE> on port <CODE>1234</CODE>. <P> Port <I>names</I> are also accepted. For example, suppose a @@ -190,7 +190,7 @@ </BLOCKQUOTE> <P> Port numbers range from <CODE>0</CODE> (causes port to be chosen - by operating system) to <CODE>65355</CODE>. Port numbers less + by operating system) to <CODE>65335</CODE>. Port numbers less than <CODE>1024</CODE> on UNIX systems are considered privileged, and require super-user privileges to access them. Also be aware that some ports may already be in use by other @@ -210,7 +210,8 @@ interface detected by TAO. The port for each opened endpoint will be chosen automatically. The chosen port will be the same for all endpoints. Each endpoint will be represented in - generated IOR as a separate profile. + generated IOR as a separate profile, or as an alternate address + within a single IOR profile (once IIOP 1.2 is supported). <P> Note that network interface detection only work on platforms that support this feature. If network interface detection isn't @@ -327,7 +328,6 @@ <LI><CODE>-ORBEndpoint iiop://1.1@:1234</CODE> <LI><CODE>-ORBEndpoint iiop://1.1@,1.0@:1234,1.1@</CODE> <LI><CODE>-ORBEndpoint iiop://1.1@foo:2020/portspan=30</CODE> - <LI><CODE>-ORBEndpoint iiop://foo:2020 -ORBEndpoint iiop://foo:10020 </CODE> </CODE> </UL> <hr> diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index baa2dc38466..45077a56964 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -207,7 +207,7 @@ same host: % NameService.exe -ORBEndpoint iiop://localhost:12345 </code></p> <p><code> -% client.exe -ORBInitRef NameService=iiop://localhost:12345 +% client.exe -ORBInitRef NameService=iiop://localhost:12345" </code></p> <p>An explanation of these command-line options appears below. </p> <p></p> @@ -909,11 +909,6 @@ the ORB uses. The default reactor is the ACE_TP_Reactor. <td><code>tp</code></td> <td>Use the <code>ACE_TP_Reactor</code>, a select based thread-pool reactor which is the - MT_NO_UPCALL 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. - default.</td> </tr> </tbody> @@ -1173,11 +1168,7 @@ a null lock is used. This makes sense in case of optimizations and is allowed when no forwarding is used or only a single threaded client. </td> </tr> <tr> - <td><code>-ORBClientConnectionHandler</code> <em>MT | ST | RW - / MT_NOUPCALL</em><br> - <code>-ORBWaitStrategy</code> <em>MT / ST / RW / MT_NOUPCALL - </em> -</td> + <td><code>-ORBClientConnectionHandler</code> <em>MT | ST | RW</em></td> <td><a name="-ORBClientConnectionHandler"></a><em>ST</em> means use the single-threaded client connection handler, i.e., the leader follower model will not be used. However, <em>ST</em> does support @@ -1198,18 +1189,6 @@ strategy will only effect two way calls, since there is no waiting for one way calls. This strategy can also be used in an application that is both a client and a server if the server side is handled by a separate thread and the client threads are "pure" clients. </p> -<p> - MT_NOUPCALL 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 - 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 effect of AMI on this option is. ---> -</p> <p>Default for this option is <em>MT</em>. </p> </td> </tr> diff --git a/TAO/docs/cec_options.html b/TAO/docs/cec_options.html index b00b58ee590..8df20da62bb 100644 --- a/TAO/docs/cec_options.html +++ b/TAO/docs/cec_options.html @@ -158,18 +158,10 @@ static CEC_Factory "-CECDispatching reactive ....." <TD><CODE>-CECConsumerControlTimeout</CODE> <EM>timeout</EM> </TD> - <TD><P>Set the relative roundtrip timeout for push and pull - consumers. The default is 10000 microseconds. - This relative roundtrip timeout is utilized - when each consumer attached to the supplier is queried. - If querying any one of the consumers times out, it may - be disconnected depending on the - -CECProxyDisconnectRetries setting. - </P> - <P>This option can also be referenced as - -CECConsumerControlRoundtripTimeout. - </P> - </TD> + <TD>Set the timeout period (in microseconds) used by the reactive + consumer control policy to detect a timeout when polling the state + of the consumers. + </TD> </TR> <!-- <TR NAME="CECSupplierControlTimeout"> --> @@ -177,18 +169,10 @@ static CEC_Factory "-CECDispatching reactive ....." <TD><CODE>-CECSupplierControlTimeout</CODE> <EM>timeout</EM> </TD> - <TD><P>Set the relative roundtrip timeout for push or pull - suppliers. The default is 10000 microseconds. - This relative roundtrip timeout is utilized - when each supplier attached to the consumer is queried. - If querying any one of the suppliers times out, it may - be disconnected depending on the - -CECProxyDisconnectRetries setting. - </P> - <P>This option can also be referenced as - -CECSupplierControlRoundtripTimeout. - </P> - </TD> + <TD>Set the timeout period (in microseconds) used by the reactive + supplier control policy to detect a timeout when polling the state + of the suppliers. + </TD> </TR> <!-- <TR NAME="CECReactivePullingPeriod"> --> @@ -300,19 +284,6 @@ static CEC_Factory "-CECDispatching reactive ....." </P> </TD> </TR> - - <!-- <TR NAME="CECProxyDisconnectRetries"> --> - <TR> - <TD><CODE>-CECProxyDisconnectRetries</CODE> - <EM>number of retries</EM> - </TD> - <TD><P>This determines the number of times a consumer or - supplier can be "unresponsive" before the supplier or - consumer control will disconnect it. The default is zero - retries. - </P> - </TD> - </TR> </TABLE> </P> diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index 3c67ac8d5cd..581cbdc303e 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -38,20 +38,20 @@ these files:) <P> <UL> <LI> <B><EM>Client stubs</EM></B>, <EM>i.e.</EM>, <tt>*C.h</tt>, - <tt>*C.inl</tt>, and <tt>*C.cpp</tt>. Pure client applications + <tt>*C.i</tt>, and <tt>*C.cpp</tt>. Pure client applications only need to <code>#include</code> and link with these files. - <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>, <tt>*S.h</tt>, <tt>*S.inl</tt>, and + <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>, <tt>*S.h</tt>, <tt>*S.i</tt>, and <tt>*S.cpp</tt>. Servers need to <code>#include</code> and link with these files. - <LI> <B><EM>Server skeleton templates</EM></B>, <EM>i.e.</EM>, <tt>*S_T.h</tt>, <tt>S_T.inl</tt>, + <LI> <B><EM>Server skeleton templates</EM></B>, <EM>i.e.</EM>, <tt>*S_T.h</tt>, <tt>S_T.i</tt>, and <tt>*S_T.cpp</tt>. Some C++ compilers do not like template and non-template code in the same files, so TAO's IDL compiler generates these files separately. </UL> -TAO's IDL compiler creates separate <TT>*.inl</TT> and <TT>*S_T.*</TT> +TAO's IDL compiler creates separate <TT>*.i</TT> and <TT>*S_T.*</TT> files to improve the performance of the generated code. For example, -the <TT>*.inl</TT> files enable you to compile with inlining enabled or +the <TT>*.i</TT> files enable you to compile with inlining enabled or not, which is useful for trading-off compile-time and run-time performance. Fortunately, you only need to <CODE>#include</CODE> the client stubs declared in the <tt>*C.h</tt> file and the skeletons in @@ -327,9 +327,9 @@ also receives other options that are specific to it. <p> <td><tt>post_include=</tt><i>include_path</i></td> <td>The compiler will generate code to include <i>include_path</i> at the - bottom of the each header file. For example, ace/post.h, which pops - compiler options for the Borland C++ Builder and MSVC++ compilers, is - included in this manner in all IDL-generated files in the TAO libraries + bottom of the each header file. For example, ace/post.h, which pops + compiler options for the Borland C++ Builder and MSVC++ compilers, is + included in this manner in all IDL-generated files in the TAO libraries and CORBA services.</td> </tr> @@ -490,7 +490,7 @@ also receives other options that are specific to it. <p> <tr><a name="ci"> <td><tt>-ci</tt></td> - <td>Client inline file name ending. Default is "C.inl".</td> + <td>Client inline file name ending. Default is "C.i".</td> <td> </td> </tr> @@ -511,26 +511,26 @@ also receives other options that are specific to it. <p> <tr><a name="si"> <td><tt>-si</tt></td> - <td>Server inline skeleton file name ending. Default is "S.inl".</td> + <td>Server inline skeleton file name ending. Default is "S.i".</td> <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>Server's template inline file name ending. Default is "S_T.i".</td> <td> </td> </tr> <tr><a name="t"> <td><tt>-t</tt></td> - <td>Temporary directory to be used by the IDL compiler. + <td>Temporary directory to be used by the IDL compiler. </td> <td>Unix: use environment variable TEMPDIR if defined, else use /tmp/. - Windows 95/98/Me: use environment variable TMP or TEMP if defined + Windows 95/98/Me: use environment variable TMP or TEMP if defined and directory exists, else use current directory. Windows NT/2000/XP: - use environment variable TMP or TEMP if defined, else use the + use environment variable TMP or TEMP if defined, else use the Windows directory. </td> </tr> @@ -577,10 +577,10 @@ also receives other options that are specific to it. <p> will use native C++ exceptions. If the value of the flag is 1, tao_idl will generate code that 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). The default depends on how TAO_IDL - has been built. If TAO_IDL is built with native exceptions enabled, the IDL - compiler will not generate the emulated exception macros. If IDL compiler is + in place of ACE_THROW_SPEC, ACE_THROW, and ACE_RETRHOW (ACE_THROW_RETURN and + TAO_INTERCEPTOR_THROW will still be used). The default depends on how TAO_IDL + has been built. If TAO_IDL is built with native exceptions enabled, the IDL + compiler will not generate the emulated exception macros. If IDL compiler is built with native exceptions disabled, macros would be generated by default. </td> <td> </td> </tr> @@ -625,7 +625,7 @@ also receives other options that are specific to it. <p> <td>Generate type code and Any operator bodies in *A.cpp</td> <td>Decouples client and server decisions to compile and link - TypeCode- and Any-related code, which is generated in + TypeCode- and Any-related code, which is generated in *C.cpp by default.</td> </tr> @@ -734,16 +734,11 @@ also receives other options that are specific to it. <p> <td> </td> </tr> - <tr><a name="Sm"> - <td><tt>-Sm</tt></td> + <tr><a name="Sv"> + <td><tt>-Sv</tt></td> - <td>Suppress C++ code generation from CCM 'implied' IDL.</td> - <td>This code generation is achieved by default using a 'preprocessing' visitor - that modified the AST and is launched just before the code generating - visitors. There is a new tool in CIAO that converts the entire IDL file - into one containing explicit declarations of the implied IDL types. - For such a file, we don't want the preprocessing visitor to bve launched, - so this command line option will suppress it.</td> + <td>Suppress valuetype support.</td> + <td> </td> </tr> </table> <P> diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html index f583dc4a4af..a07553476c8 100644 --- a/TAO/docs/libraries.html +++ b/TAO/docs/libraries.html @@ -90,6 +90,13 @@ and the dependencies outlined below are the same. <P> <td>dynamicinterface.mpb</td> </tr> <tr align=left> + <th>libTAO_DynamicInterface.so</th> + <td>Support for DII and DSI invocations. Applications have to + <code> #include "tao/DynamicInterface/Dynamic_Adapter_Impl.h" + </code> to get the right symbols.</td> + <td>dynamicinterface.mpb</td> + </tr> + <tr align=left> <th>libTAO_IFR_Client.so</th> <td>Support for client/stub side interfaces for InterfaceRepository applications. Applications have to <code> diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html index b1469d84279..68f29b61d5f 100644 --- a/TAO/docs/orbsvcs.html +++ b/TAO/docs/orbsvcs.html @@ -34,7 +34,7 @@ bgcolor="#ffffff"> so files are included like this:</P> <P><CODE> - #include "orbsvcs/CosNamingC.h" + #include "orbsvcs/orbsvcs/CosNamingC.h" </CODE></P> <P>To simplify the IDL generation the skeletons are also on the @@ -114,7 +114,7 @@ bgcolor="#ffffff"> </TR> <TR> <TD>Scheduling Service</TD> - <TD><CODE>orbsvcs/orbsvcs/Sched</CODE></TD> + <TD><CODE>orbsvcs/Sched</CODE></TD> <TD>Venkita Subromianian <vankita at cs dot wustl dot edu> </TR> <TR> diff --git a/TAO/docs/releasenotes/OBV.html b/TAO/docs/releasenotes/OBV.html index 6320b983ab1..2878175f439 100644 --- a/TAO/docs/releasenotes/OBV.html +++ b/TAO/docs/releasenotes/OBV.html @@ -14,7 +14,7 @@ <a href="mailto: bosk@ipmce.ru">Boris Kolpackov</a> <a href="mailto:g.edwards@vanderbilt.edu">George Edwards</a> - <p>Last Update: 2004/08/24 </p> + <p>Last Update: 2003/06/30 </p> </center> <p>Objects-by-Value (OBV) describes the new type, <CODE>valuetype</CODE>, introduced in CORBA 2.3 @@ -49,12 +49,14 @@ <ul> <li><p>The IDL compiler understands <CODE>valuetype</CODE>. - Relevant option of TAO's IDL compiler is: <P> + Relevant options of TAO's IDL compiler are: <P> <UL> + <LI>-Gv Enable OBV support (default) + <LI>-Sv Disable OBV support <LI>-Wb,obv_opt_accessor Make accessor and modifier functions inline. - Overriding them is not allowed in this mode.</LI> - </UL></P> - <p></p> + Overriding them is not allowed in this mode. + </UL> + <p><CODE>libTAO</CODE> must be compiled with <CODE>TAO_HAS_VALUETYPE</CODE>.</p> </li> <li><p><CODE>Valuetype</CODE>s can be used as arguments in CORBA invocations. There is an example in diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index 751a13f40e8..20946967024 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -185,9 +185,6 @@ Notification Service <li> <a href="../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li> <li> -<a href="../../CIAO/docs/releasenotes/dance.html">Deployment and - Configuration Engine (DAnCE)</a></li> -<li> <a href="../../CIAO/CIDLC/README.html">Component Implementation Definition Language Compiler (CIDLC)</a></li> <li> @@ -279,7 +276,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 August 14, 2004.) +<p>Current status: (As of July 6, 2004.) <ul> <li> Generated code closely follows the C++ Mapping specified in the latest @@ -438,8 +435,11 @@ far only the repository ID is output, but this may be enhanced when requirements and/or desires become clearer.</li> <li> -The IDL compiler has support for valuetypes (see release notes -for valuetypes for details). </li> +The IDL compiler now has limited support for valuetypes (see release notes +for valuetypes for details). If the TAO library is built with TAO_HAS_VALUETYPE +defined, and IDL_HAS_VALUETYPE is also defined, then the IDL compiler will +enable OBV support with the command line option -Gv, and disable it with +the option -Sv (the default).</li> <li> As part of the implementation of interceptors, the TAO IDL compiler now @@ -627,15 +627,6 @@ IDL compiler now processes the files sequentially in a single process. Note that, for each file, execution of the preprocessor spawns a new process, as it always has. </li> - -<li> -Added command line option -Sm to suppress the action of CCM preprocessing -visitor, which is by default launched before the C++ generating visitors, -in order to add CCM equivalent IDL to the AST. There is a new tool in CIAO -which converts IDL files by replacing IDL3 constructs with equivalent IDL2 -constructs, and if the IDL compiler is run on these files, we do not want -the CCM preprocessing to occur. -</li> </ul> <h4> diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h index 819c4ed0cb5..3d54c9ff404 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h @@ -5,8 +5,8 @@ #ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H #define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H -#include <orbsvcs/CosEventCommS.h> -#include <orbsvcs/CosEventChanneAdminC.h> +#include <orbsvcs/orbsvcs/CosEventCommS.h> +#include <orbsvcs/orbsvcs/CosEventChanneAdminC.h> class Stock_Consumer : public POA_CosEventComm::PushConsumer { public: 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 edaddf509bd..f5965752877 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc @@ -1,16 +1,18 @@ // -*- MPC -*- // $Id$ -project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba { +project(*client) : orbsvcsexe, portableserver, event, naming { requires += exceptions + avoids += minimum_corba source_files { client.cpp Stock_Consumer.cpp } } -project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba { +project(*server) : orbsvcsexe, portableserver, event, naming { requires += exceptions + avoids += minimum_corba source_files { server.cpp Stock_Factory_i.cpp diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h index d5de84958cd..b880122709a 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h @@ -5,8 +5,8 @@ #ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H #define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H -#include <orbsvcs/CosEventCommS.h> -#include <orbsvcs/CosEventChannelAdminC.h> +#include <orbsvcs/orbsvcs/CosEventCommS.h> +#include <orbsvcs/orbsvcs/CosEventChannelAdminC.h> class Stock_Consumer : public POA_CosEventComm::PushConsumer { public: diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h index 47ac82f0003..fe92edb307e 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h @@ -6,7 +6,7 @@ #define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_FACTORY_I_H #include "QuoterS.h" -#include <orbsvcs/CosEventChannelAdminS.h> +#include <orbsvcs/orbsvcs/CosEventChannelAdminS.h> class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory { public: diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h index d6e82748c82..c273ff5a4c7 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h @@ -6,8 +6,8 @@ #define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_I_H #include "QuoterS.h" -#include <orbsvcs/CosEventCommS.h> -#include <orbsvcs/CosEventChannelAdminC.h> +#include <orbsvcs/orbsvcs/CosEventCommS.h> +#include <orbsvcs/orbsvcs/CosEventChannelAdminC.h> class Quoter_Stock_i : public virtual POA_Quoter::Modify_Stock, diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp index 43abc2992c9..0f1b5491cb3 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp @@ -3,7 +3,7 @@ // #include "Stock_Consumer.h" -#include <orbsvcs/CosNamingC.h> +#include <orbsvcs/orbsvcs/CosNamingC.h> #include "ace/streams.h" int main (int argc, char* argv[]) diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp index 56b0532a42c..dfe70557c91 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp @@ -3,7 +3,7 @@ // #include "Stock_Factory_i.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/streams.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp index c26cf41b26c..992af2980af 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp @@ -3,7 +3,7 @@ // #include "QuoterC.h" -#include <orbsvcs/CosNamingC.h> +#include <orbsvcs/orbsvcs/CosNamingC.h> #include "ace/streams.h" int main (int argc, char* argv[]) diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp index 86d293611bc..b961ff80081 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp @@ -3,7 +3,7 @@ // #include "Stock_Factory_i.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/streams.h" int main (int argc, char* argv[]) 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 a6df82cb29a..b3226bc8160 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 @@ -1,16 +1,18 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, naming, ami, minimum_corba { +project(*client) : taoexe, portableserver, naming, ami { requires += exceptions + avoids += minimum_corba source_files { client.cpp Handler_i.cpp } } -project(*server) : taoexe, portableserver, naming, ami, minimum_corba { +project(*server) : taoexe, portableserver, naming, ami { requires += exceptions + avoids += minimum_corba source_files { server.cpp Stock_Factory_i.cpp 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 5134a909130..785c8628d04 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 @@ -1,16 +1,18 @@ // -*- MPC -*- // $Id$ -project(*client) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba { +project(*client) : orbsvcsexe, portableserver, rtevent, naming { requires += exceptions + avoids += minimum_corba source_files { client.cpp Stock_Consumer.cpp } } -project(*server) : orbsvcsexe, portableserver, rtevent, naming, minimum_corba { +project(*server) : orbsvcsexe, portableserver, rtevent, naming { requires += exceptions + avoids += minimum_corba source_files { server.cpp Stock_Factory_i.cpp diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h index a82044836bc..5761200e4e7 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h @@ -5,8 +5,8 @@ #ifndef TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H #define TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H -#include <orbsvcs/RtecEventCommS.h> -#include <orbsvcs/RtecEventChannelAdminC.h> +#include <orbsvcs/orbsvcs/RtecEventCommS.h> +#include <orbsvcs/orbsvcs/RtecEventChannelAdminC.h> class Stock_Consumer : public POA_RtecEventComm::PushConsumer { public: diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h index c30c68e2a69..9ff5db1ac4f 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h @@ -6,7 +6,7 @@ #define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_FACTORY_I_H #include "QuoterS.h" -#include <orbsvcs/RtecEventChannelAdminS.h> +#include <orbsvcs/orbsvcs/RtecEventChannelAdminS.h> class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory { public: diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp index ea37a47f82b..d793656d196 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Stock_i.h" -#include <orbsvcs/Event_Utilities.h> +#include <orbsvcs/orbsvcs/Event_Utilities.h> ///derive a class from the tie template class to release itself by ref_count class MyTieStock:public POA_RtecEventComm::PushSupplier_tie<Quoter_Stock_i> diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h index 7ec530709eb..996a4323f20 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h @@ -6,8 +6,8 @@ #define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_I_H #include "QuoterS.h" -#include <orbsvcs/RtecEventCommS.h> -#include <orbsvcs/RtecEventChannelAdminC.h> +#include <orbsvcs/orbsvcs/RtecEventCommS.h> +#include <orbsvcs/orbsvcs/RtecEventChannelAdminC.h> class Quoter_Stock_i : public virtual POA_Quoter::Modify_Stock, diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp index 95fc7a4ee53..cdf17f1f5cf 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp @@ -3,8 +3,8 @@ // #include "Stock_Consumer.h" -#include <orbsvcs/CosNamingC.h> -#include <orbsvcs/Event_Utilities.h> +#include <orbsvcs/orbsvcs/CosNamingC.h> +#include <orbsvcs/orbsvcs/Event_Utilities.h> #include "ace/streams.h" #include "ace/OS_NS_string.h" diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp index 3660fc9b82d..94c6764003f 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp @@ -3,7 +3,7 @@ // #include "Stock_Factory_i.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/streams.h" #include "ace/OS_NS_unistd.h" 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 2178e744e80..dca23bb8206 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 @@ -11,7 +11,7 @@ project(*client) : taoexe, portableserver, rtevent, naming { } } -project(*server) : taoexe, portableserver, rtevent, naming, iortable { +project(*server) : taoexe, portableserver, rtevent, naming { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib includes += ../../idl 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 d7152082ec0..202171a2f9e 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,6 @@ // $Id$ -project : taoexe, portableserver, minimum_corba { +project : taoexe, portableserver { + avoids += minimum_corba libs += Quoter_Idl_Lib after += Quoter_Idl_Lib includes += ../../idl diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html index 3b100609d88..9d97da6874e 100644 --- a/TAO/docs/tutorials/Quoter/index.html +++ b/TAO/docs/tutorials/Quoter/index.html @@ -25,13 +25,13 @@ magazine. </P> - <P>This tutorial builds up from simple client and server + <P>In this tutorial, we build up from simple client and server applications to explore advanced TAO features, such as <A HREF="http://www.cs.wustl.edu/~schmidt/report-doc.html#ami"> asynchronous method invocation</A>, - <A HREF="http://www.cs.wustl.edu/~schmidt/PDF/C++-report-col19.pdf"> + <A HREF="http://www.cs.wustl.edu/~schmidt/C++-report-col19.ps.gz"> reliable oneways</A>, - the <A HREF="http://www.cs.wustl.edu/~schmidt/PDF/JSAC-98.pdf"> + the <A HREF="http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz"> real-time Events Service</A>, the <A HREF="../../INS.html"> Interoperable Naming Service</A> @@ -90,7 +90,7 @@ <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address> <!-- Created: Sat Nov 27 15:25:06 CST 1999 --> <!-- hhmts start --> -Last modified: Fri Aug 27 13:04:01 CDT 2004 +Last modified: Fri Feb 8 14:12:11 CST 2002 <!-- hhmts end --> </body> </html> |