ChangeLog

16 files changed, 90 insertions, 70 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 32ee0677c68..26c283a4acb 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Fri Jul 16 13:59:10 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* examples/Borland: Updated the examples to contain several minor
+	  fixes for Borland C++ Builder.  Thanks to Christopher Kohlhoff
+ 	  <chris@kohlhoff.com> for reporting this.
+  
 Fri Jul 16 12:21:58 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
 
           Fixed a CORBA::TRANSIENT exception thrown by an _narrow () by 
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
index a4466563beb..30ce21b689f 100644
--- a/TAO/docs/configurations.html
+++ b/TAO/docs/configurations.html
@@ -277,7 +277,7 @@ The following are common ORB configurations used by TAO applications.<P>
 
 <ul>
   <li>
-      <a NAME="reactive"></a>Single-threaded, reactive model.</li><P>
+      <a NAME="reactive"></a>Single-threaded, reactive model.</li> <P>
 
       <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
         <tr>
@@ -318,9 +318,9 @@ The following are common ORB configurations used by TAO applications.<P>
               select_st</tt>, <tt>-ORBInputCDRAllocator null</tt>
               <br><tt>TAO_Server_Strategy_Factory</tt>:
               <tt>-ORBconcurrency reactive</tt> (default),
-              <tt>-ORBPOALock null</tt></td>
+              <tt>-ORBPOALock null</tt>
               <br><tt>TAO_Client_Strategy_Factory</tt>:
-              <tt>-ORBConnectorLock null</tt>
+              <tt>-ORBConnectorLock null</tt></td>
           </td>
         </tr>
       </table>
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index c0aa2f883ca..11b0a8f6874 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -14,7 +14,9 @@ LDLIBS  = -lorbsvcs -lTAO
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2 = Naming_Service
+FILES = Naming_Service
+
+BIN2 = Naming_Server
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
new file mode 100644
index 00000000000..113054c51f9
--- /dev/null
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -0,0 +1,30 @@
+// $Id$
+
+#include "Naming_Service.h"
+
+// Driver function for the TAO Naming Service.
+
+int
+main (int argc, char *argv[])
+{
+  TAO_Naming_Service naming_service;
+
+  if (naming_service.init (argc, argv) == -1)
+    return -1;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      naming_service.run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NamingService");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (1);
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 1a369687b8c..07c51e4ddc8 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -185,29 +185,3 @@ TAO_Naming_Service::~TAO_Naming_Service (void)
 {
 }
 
-int
-main (int argc, char *argv[])
-{
-  TAO_Naming_Service naming_service;
-
-  int init_result = naming_service.init (argc, argv);
-
-  if (init_result == -1)
-    return -1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      naming_service.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NamingService");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README
index 55db915353a..f309d51bc0f 100644
--- a/TAO/orbsvcs/Naming_Service/README
+++ b/TAO/orbsvcs/Naming_Service/README
@@ -1,18 +1,17 @@
 // $Id$
 
-This directory contains the files that implement the TAO
-Naming server.
-
+This directory contains the files that implement a server for the TAO
+Naming Service.
 
 To Run:
 ======
 
-% Naming_Service [-ORBnameserviceport nsport]
-                 [-o ior_output_file]
-                 [-p pid_file_name]
-                 [-s context_size]
-                 [-t time]
-                 [-f persitence_file_name]
+% Naming_Server [-ORBnameserviceport nsport]
+                [-o ior_output_file]
+                [-p pid_file_name]
+                [-s context_size]
+                [-t time]
+                [-f persitence_file_name]
 
 Optional Command-line Arguments:
 ===============================
@@ -25,7 +24,7 @@ Optional Command-line Arguments:
                 The name of the file, in which to store the IOR of the
                 root Naming Service context.
 
-       pid_file_name
+        pid_file_name
                 The name of the file, in which to store the process id
                 of the Naming Service server.
 
@@ -52,9 +51,9 @@ Environment Variables:
                 clients trying to bootstrap to a Naming Service
                 through the use of multicast.
 
-
 Persistence:
 ===========
+
 TAO Naming Service has an optional persistence capability.  By
 default, the Naming Service is started in a non-persistent mode.
 Supplying "-f" command-line option to the server causes a persistent
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 275ba51a860..7f8a2e5712b 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -46,18 +46,29 @@ TAO_IOR_Multicast::init (const char *ior,
                          TAO_Service_ID service_id)
 {
   this->service_id_ = service_id;
-  this->mcast_addr_.set (port, mcast_addr);
   this->ior_ = ior;
-  this->response_addr_.set ((u_short) 0);
-  this->response_.open (this->response_addr_);
-
+  if (this->mcast_addr_.set (port,
+                             mcast_addr) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "set"),
+                      -1);
+  else if (this->response_addr_.set ((u_short) 0) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "set"),
+                      -1);
+  else if (this->response_.open (this->response_addr_) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "set"),
+                      -1);
   // Use ACE_SOCK_Dgram_Mcast factory to subscribe to multicast group.
-  if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
+  else if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "subscribe"),
                       -1);
-
   return 0;
 }
 
@@ -86,7 +97,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   // Take a peek at the header to find out how long is the service
   // name string we should receive.
   ssize_t n = this->mcast_dgram_.recv (&header,
-                                       sizeof(header),
+                                       sizeof (header),
 				       remote_addr,
                                        MSG_PEEK);
   if (n <= 0)
@@ -94,7 +105,6 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
                        "TAO_IOR_Multicast::handle_input - peek %d\n",
 		       n),
 		      0);
-
   else if (ACE_NTOHS (header) <= 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Header value < 1\n"),
@@ -105,7 +115,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
   iovec iov[iovcnt];
 
   iov[0].iov_base = (char *) &header;
-  iov[0].iov_len  = sizeof(header);
+  iov[0].iov_len  = sizeof (header);
   iov[1].iov_base = (char *) &remote_port;
   iov[1].iov_len  = sizeof (ACE_UINT16);
   iov[2].iov_base = (char *) service_name;
@@ -183,7 +193,6 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
 
   ssize_t result = stream.sendv_n (iovp,
                                    cnt);
-
   // Close the stream.
   stream.close ();
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index 13aee01facd..ab2990aef7b 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -23,9 +23,9 @@ sub name_server
     my $prog = "..".$DIR_SEPARATOR
       ."..".$DIR_SEPARATOR
 	."..".$DIR_SEPARATOR
-	  ."Naming_Service".$DIR_SEPARATOR
-	."Naming_Service ".$EXE_EXT;
-    print ("\nNaming_Service $args\n");
+	  ."Naming_Server".$DIR_SEPARATOR
+	."Naming_Server ".$EXE_EXT;
+    print ("\nNaming_Server $args\n");
     $NS = Process::Create ($prog, $args);
     if (ACE::waitforfile_timed ($nsior, 5) == -1) {
       print STDERR "ERROR: cannot find naming service IOR file\n";
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
index 78ee631e29b..4cf296d5cf6 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
@@ -30,8 +30,8 @@ sub cosec_multiple_test1
     # first start the Naming service..
     $SV1 = Process::Create ("..".$DIR_SEPARATOR
 			    ."..".$DIR_SEPARATOR
-			    ."Naming_Service".$DIR_SEPARATOR
-			    ."Naming_Service".$EXE_EXT, "");
+			    ."Naming_Server".$DIR_SEPARATOR
+			    ."Naming_Server".$EXE_EXT, "");
 
     sleep 10;
 
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
index 6f30b6ee0c8..6a00abf4556 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
@@ -17,7 +17,7 @@ $status = 0;
 sub cosec_multiple_test2
 {
     # first start the Naming service..
-    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Service".$EXE_EXT, "");
+    $SV1 = Process::Create ($EXEPREFIX."../../Naming_Service/Naming_Server".$EXE_EXT, "");
 
     sleep 10;
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index 82d4989007a..e5c637bb8bb 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -15,8 +15,8 @@ $status = 0;
 
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
-                       "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Service".$EXE_EXT,
+                       "Naming_Server".$DIR_SEPARATOR.
+                       "Naming_Server".$EXE_EXT,
                        " -o $NS_ior ");
 
 if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index de2b010c3c8..87915cb0f50 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -14,8 +14,8 @@ $status = 0;
 
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
-                       "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Service".$EXE_EXT,
+                       "Naming_Server".$DIR_SEPARATOR.
+                       "Naming_Server".$EXE_EXT,
                        " -o $NS_ior ");
 if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
   print STDERR "ERROR: waiting for naming service IOR file\n";
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index 950053d6afd..35564d005d5 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -40,8 +40,8 @@ $ns_ior = "NameService.ior";
 unlink $ns_ior;
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
-                       "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Service".$EXE_EXT,
+                       "Naming_Server".$DIR_SEPARATOR.
+                       "Naming_Server".$EXE_EXT,
                        " -o $ns_ior ");
 
 if (ACE::waitforfile_timed ($ns_ior, 5) == -1) {
diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
index 0c2eade7460..cdddd5dde5b 100755
--- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
@@ -15,8 +15,8 @@ $status = 0;
 
 $NS = Process::Create ("..".$DIR_SEPARATOR
 		       ."..".$DIR_SEPARATOR
-		       ."Naming_Service".$DIR_SEPARATOR
-		       ."Naming_Service".$EXE_EXT,
+		       ."Naming_Server".$DIR_SEPARATOR
+		       ."Naming_Server".$EXE_EXT,
 		       " -o $NS_ior ");
 
 if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index e2604ab132a..ada53c35f7d 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -22,13 +22,13 @@ sub name_server
 {
     my $args = " -o $nsior";
     my $prog = 
-      print STDERR "\nNaming_Service: $args\n";
+    print STDERR ("\nNaming_Server: $args\n");
 
     unlink $nsior;
     $NS = Process::Create ("..".$DIR_SEPARATOR
 			   ."..".$DIR_SEPARATOR
-			   ."Naming_Service".$DIR_SEPARATOR
-			   ."Naming_Service".$EXE_EXT, $args);
+			   ."Naming_Server".$DIR_SEPARATOR
+			   ."Naming_Server".$EXE_EXT, $args);
     if (ACE::waitforfile_timed ($nsior, 5) == -1) {
       print STDERR "ERROR: cannot find naming service IOR file\n";
       $NS->Kill (); $NS->TimedWait (1);
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 7f5167f5db5..34f58a4573b 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -30,8 +30,8 @@ sub name_server
 {
   my $args = "@_ "."-ORBnameserviceport $ns_multicast_port -o $iorfile";
   my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR".
-      "Naming_Service".$DIR_SEPARATOR.
-          "Naming_Service".$EXE_EXT;
+      "Naming_Server".$DIR_SEPARATOR.
+          "Naming_Server".$EXE_EXT;
 
   unlink $iorfile;
   $NS = Process::Create ($prog, $args);