summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/docs/releasenotes/trader.html32
-rw-r--r--TAO/orbsvcs/tests/Naming/README19
-rw-r--r--TAO/orbsvcs/tests/Naming/ns_tree.cpp30
-rw-r--r--TAO/tests/Param_Test/README2
4 files changed, 25 insertions, 58 deletions
diff --git a/TAO/docs/releasenotes/trader.html b/TAO/docs/releasenotes/trader.html
deleted file mode 100644
index 4a2c3883162..00000000000
--- a/TAO/docs/releasenotes/trader.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HR>
-<H3><A NAME="tservices"></A>CORBA Trader Service</H3>
-Point of contact: <A HREF="mailto:sbw1@cs.wustl.edu">Seth Widoff</A> and <A HREF="mailto:marina@cs.wustl.edu">Marina Spivak</a><P>
-
-<P>Current status:
-
-<ul>
-<li> Lookup Interface </li>
-<li> Constraint Interpreter (for constraint based lookup)</li>
-<li> Register Interface </li>
-<li> Offer Iterator, Offer Id Iterator </li>
-<li> Abstract Interfaces </li>
-<li> Service Type Repository </li>
-<li> Admin Interface</li>
-<li> Support for Dynamic Property Evaluation</li>
-</ul>
-
-<P>Future work:
-
-<ul>
-<li>Utilization of Service Type Repository by Register and Lookup <br>
- to provide full type checking</li>
-<li>TAO and NT releases</li>
-<li>Link Interface </li>
-</ul>
-
-Complete design information on the TAO Trader service is available <A
-HREF="http://www.cs.wustl.edu/~marina/Trader_status.html">online</A>.
-The source code for the Trader service is also available <A
-HREF="http://www.cs.wustl.edu/~sbw1/trader.zip">online</A>, as well.
-We will be integrating this with TAO shortly. <P>
-</ul>
diff --git a/TAO/orbsvcs/tests/Naming/README b/TAO/orbsvcs/tests/Naming/README
index 35a1cb362c2..4f02780c57e 100644
--- a/TAO/orbsvcs/tests/Naming/README
+++ b/TAO/orbsvcs/tests/Naming/README
@@ -1,13 +1,16 @@
+// $Id$
-Currently the test app is compiled to:
+The ns_tree.cpp test application exercises various features of TAO's
+Naming Service. It behaves as follows:
- - binds a new context ("MyContext").
- - binds the compound name ("MyContext;MyName") into the
- root context.
- - resolves the compount name ("MyContext;MyName").
+ 1. It binds a new context ("MyContext").
+ 2. It binds the compound name ("MyContext;MyName") into the
+ root context.
+ 3. It resolves the compount name ("MyContext;MyName").
-(Functioning of hierarchical test implies functioning of the flat case)
+In this case, proper functioning of the hierarchical test implies
+functioning of the "flat" test.
-
-A collection of various tests selectable by command line arguments will be available later.
+A collection of various tests selectable by command line arguments
+will be available later.
diff --git a/TAO/orbsvcs/tests/Naming/ns_tree.cpp b/TAO/orbsvcs/tests/Naming/ns_tree.cpp
index e14f06c2070..303bebb9df6 100644
--- a/TAO/orbsvcs/tests/Naming/ns_tree.cpp
+++ b/TAO/orbsvcs/tests/Naming/ns_tree.cpp
@@ -10,7 +10,6 @@
// = AUTHOR
// Ross Lillie <lillie@rsch.comm.mot.com>
// LMPS Systems Research Lab
-//
//
// ============================================================================
@@ -40,23 +39,23 @@ main (int argc, char **argv)
if (orbmgr.init_child_poa (argc, argv,"Rob", TAO_TRY_ENV) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"failed to init ORB\n"),
- -1);
+ -1);
TAO_CHECK_ENV;
- PortableServer::POA_var child_poa;
- CORBA::ORB_var orb = orbmgr.orb ();
+ PortableServer::POA_var child_poa;
+ CORBA::ORB_var orb = orbmgr.orb ();
- child_poa = orbmgr.child_poa ();
- result = my_name_server.init (orb, child_poa);
+ child_poa = orbmgr.child_poa ();
+ result = my_name_server.init (orb, child_poa);
- if (result < 0)
- return result;
+ if (result < 0)
+ return result;
- CosNaming::Name context_name;
- CosNaming::NamingContext_var ns_ctx;
- context_name.length (1);
- context_name[0].id = CORBA::string_dup ("NameService");
- ns_ctx = my_name_server->bind_new_context (context_name, TAO_TRY_ENV);
+ CosNaming::Name context_name;
+ CosNaming::NamingContext_var ns_ctx;
+ context_name.length (1);
+ context_name[0].id = CORBA::string_dup ("NameService");
+ ns_ctx = my_name_server->bind_new_context (context_name, TAO_TRY_ENV);
TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
@@ -65,20 +64,19 @@ main (int argc, char **argv)
myObject._this (TAO_TRY_ENV);
TAO_CHECK_ENV;
-
// Create a child context.
CosNaming::Name test_context (1);
CosNaming::NamingContext_var my_context;
test_context.length (1);
test_context[0].id =
CORBA::string_dup ("MyContext");
- my_context = my_name_server->bind_new_context (test_context, TAO_TRY_ENV);
+ my_context = my_name_server->bind_new_context (test_context, TAO_TRY_ENV);
TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
cerr << "Created new context OK" << endl;
- // bind an object to a child context
+ // Bind an object to a child context.
CosNaming::Name test_name (2);
test_name.length (2);
test_name[0].id = CORBA::string_dup ("MyContext");
diff --git a/TAO/tests/Param_Test/README b/TAO/tests/Param_Test/README
index 5061d29648c..d20b7ff7bb4 100644
--- a/TAO/tests/Param_Test/README
+++ b/TAO/tests/Param_Test/README
@@ -1,4 +1,3 @@
-
// $Id$
// ============================================================================
@@ -14,7 +13,6 @@
//
// ============================================================================
-
This directory contains an application that tests all the parameter
passing conventions in CORBA for a number of OMG IDL data types.