ChangeLogTag:Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu>

11 files changed, 127 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index f94cca916d4..cbacc1c8e77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,16 @@ Fri Nov 24 11:42:42 2000  Darrell Brunsch <brunsch@uci.edu>
           MSVC 4.2 projects.  Thanks to Johhny Willemsen
           <johnny.willemsen@meco.nl> for pointing this out.
 
+Fri Nov 24 05:48:26 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Signal.h: Enhanced the documentation to clarify the role of sigkey.
+	  Thanks to Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se> for
+ 	  motivating this.
+
+	* ace/SOCK_Connector.h: Updated the documentation to clarify the parameters to 
+	  the constructors and the connect() method.  Thanks to Pierre
+ 	  Oberson <oberson@nagra-kudelski.ch> for suggesting this.
+
 Thu Nov 23 21:17:16 2000  David L. Levine <levine@cs.wustl.edu>
 
         * tests/Reactor_Notify_Test.cpp (main): added
@@ -40,17 +50,21 @@ Thu Nov 23 18:38:54 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
           Add ACE_wrappers/html to the list of files tagged, even though
           they are not included in the tar or zip files.
 
+Thu Nov 23 18:13:32 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+          Don't use 'grep -q' because Solaris' grep does not support it.
+
 Thu Nov 23 18:27:52 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * Makefile:
           The ACE-INSTALL file is generated in the staging directory,
           there is no need to generate it locally too.
 
-Thu Nov 23 18:13:32 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * bin/make_release:
-          Don't use 'grep -q' because Solaris' grep does not support it.
+Thu Nov 23 17:46:56 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
+	* ace/Method_Request: Made the priority() method const.  Thanks
+	  to Johnny Willemsen <jwillemsen@remedy.nl>
+  
 Thu Nov 23 14:43:40 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * Makefile:
@@ -233,6 +247,12 @@ Sun Nov 19 08:05:08 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
           types. Moved those to the base class 'Dynamic_Service_Base' and
           the Dynamic_Service inherits from the base class.
 
+Sat Nov 18 15:39:49 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: 
+	  Fixed a mistake in the "usage" string.  Thanks to Mike Curtis
+ 	  <mccurry@my-deja.com> for pointing this out.
+
 Sat Nov 18 11:35:53 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * tests/OS_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f94cca916d4..cbacc1c8e77 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -26,6 +26,16 @@ Fri Nov 24 11:42:42 2000  Darrell Brunsch <brunsch@uci.edu>
           MSVC 4.2 projects.  Thanks to Johhny Willemsen
           <johnny.willemsen@meco.nl> for pointing this out.
 
+Fri Nov 24 05:48:26 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Signal.h: Enhanced the documentation to clarify the role of sigkey.
+	  Thanks to Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se> for
+ 	  motivating this.
+
+	* ace/SOCK_Connector.h: Updated the documentation to clarify the parameters to 
+	  the constructors and the connect() method.  Thanks to Pierre
+ 	  Oberson <oberson@nagra-kudelski.ch> for suggesting this.
+
 Thu Nov 23 21:17:16 2000  David L. Levine <levine@cs.wustl.edu>
 
         * tests/Reactor_Notify_Test.cpp (main): added
@@ -40,17 +50,21 @@ Thu Nov 23 18:38:54 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
           Add ACE_wrappers/html to the list of files tagged, even though
           they are not included in the tar or zip files.
 
+Thu Nov 23 18:13:32 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+          Don't use 'grep -q' because Solaris' grep does not support it.
+
 Thu Nov 23 18:27:52 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * Makefile:
           The ACE-INSTALL file is generated in the staging directory,
           there is no need to generate it locally too.
 
-Thu Nov 23 18:13:32 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * bin/make_release:
-          Don't use 'grep -q' because Solaris' grep does not support it.
+Thu Nov 23 17:46:56 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
+	* ace/Method_Request: Made the priority() method const.  Thanks
+	  to Johnny Willemsen <jwillemsen@remedy.nl>
+  
 Thu Nov 23 14:43:40 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * Makefile:
@@ -233,6 +247,12 @@ Sun Nov 19 08:05:08 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
           types. Moved those to the base class 'Dynamic_Service_Base' and
           the Dynamic_Service inherits from the base class.
 
+Sat Nov 18 15:39:49 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: 
+	  Fixed a mistake in the "usage" string.  Thanks to Mike Curtis
+ 	  <mccurry@my-deja.com> for pointing this out.
+
 Sat Nov 18 11:35:53 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * tests/OS_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f94cca916d4..cbacc1c8e77 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -26,6 +26,16 @@ Fri Nov 24 11:42:42 2000  Darrell Brunsch <brunsch@uci.edu>
           MSVC 4.2 projects.  Thanks to Johhny Willemsen
           <johnny.willemsen@meco.nl> for pointing this out.
 
+Fri Nov 24 05:48:26 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Signal.h: Enhanced the documentation to clarify the role of sigkey.
+	  Thanks to Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se> for
+ 	  motivating this.
+
+	* ace/SOCK_Connector.h: Updated the documentation to clarify the parameters to 
+	  the constructors and the connect() method.  Thanks to Pierre
+ 	  Oberson <oberson@nagra-kudelski.ch> for suggesting this.
+
 Thu Nov 23 21:17:16 2000  David L. Levine <levine@cs.wustl.edu>
 
         * tests/Reactor_Notify_Test.cpp (main): added
@@ -40,17 +50,21 @@ Thu Nov 23 18:38:54 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
           Add ACE_wrappers/html to the list of files tagged, even though
           they are not included in the tar or zip files.
 
+Thu Nov 23 18:13:32 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+          Don't use 'grep -q' because Solaris' grep does not support it.
+
 Thu Nov 23 18:27:52 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * Makefile:
           The ACE-INSTALL file is generated in the staging directory,
           there is no need to generate it locally too.
 
-Thu Nov 23 18:13:32 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * bin/make_release:
-          Don't use 'grep -q' because Solaris' grep does not support it.
+Thu Nov 23 17:46:56 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
+	* ace/Method_Request: Made the priority() method const.  Thanks
+	  to Johnny Willemsen <jwillemsen@remedy.nl>
+  
 Thu Nov 23 14:43:40 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * Makefile:
@@ -233,6 +247,12 @@ Sun Nov 19 08:05:08 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
           types. Moved those to the base class 'Dynamic_Service_Base' and
           the Dynamic_Service inherits from the base class.
 
+Sat Nov 18 15:39:49 2000  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: 
+	  Fixed a mistake in the "usage" string.  Thanks to Mike Curtis
+ 	  <mccurry@my-deja.com> for pointing this out.
+
 Sat Nov 18 11:35:53 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * tests/OS_Test.cpp:
diff --git a/TAO/examples/POA/On_Demand_Activation/README b/TAO/examples/POA/On_Demand_Activation/README
index 392210c8131..fd86ff7842d 100644
--- a/TAO/examples/POA/On_Demand_Activation/README
+++ b/TAO/examples/POA/On_Demand_Activation/README
@@ -13,7 +13,7 @@ Servant managers are associated with POAs. A servant manager supplies
 a POA with the ability to objects on demand when the POA receives a
 request targeted at an inactive object. A servant manager is
 registered with a POA as a callback object, to be invoked by the POA
-when necessary.An application server that activates all its needed
+when necessary.  An application server that activates all its needed
 objects at the beginning of execution does not need to use a servant
 manager; it is used only for the case in which an object must be
 activated during request processing.
diff --git a/THANKS b/THANKS
index 6dbf778fe3a..eae64222581 100644
--- a/THANKS
+++ b/THANKS
@@ -1039,7 +1039,7 @@ Caleb Epstein <cae@home.com>
 Bruno Marconi <bmarconi@jetstream.com>
 Ken Childress <kchildre@uccs.jpl.nasa.gov>
 Michael Kramer <kramer@ave.ac.agit.de>
-Johhny Willemsen <johnny.willemsen@meco.nl>
+Johhny Willemsen <jwillemsen@remedy.nl>
 Jonathan Astle <JNASTLE@dera.gov.uk>
 Javier Lopez Sanchez <jlopez@uida.es>
 Nir Drang <Nir@bandwiz.com>
@@ -1085,6 +1085,10 @@ Joachim Tremouroux <joachim.tremouroux@microresearch.be>
 Momchil Velikov <velco@fadata.bg>
 Munagala Ramanath <Munagala.Ramanath@postx.com>
 Kevin Marhsall <KCMarshall@att.net>
+Adrian Mercieca <adrian@anvil.co.uk>
+David Channon <djc@uq.net.au>
+Andy Guy <andy@emory.demon.co.uk>
+Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson.  Paul devised the recursive Makefile scheme that
diff --git a/ace/Method_Request.cpp b/ace/Method_Request.cpp
index 22b5d64873a..003d5acc4f7 100644
--- a/ace/Method_Request.cpp
+++ b/ace/Method_Request.cpp
@@ -15,7 +15,7 @@ ACE_Method_Request::~ACE_Method_Request (void)
 }
 
 u_long
-ACE_Method_Request::priority (void)
+ACE_Method_Request::priority (void) const
 {
   return this->priority_;
 }
diff --git a/ace/Method_Request.h b/ace/Method_Request.h
index a6fff914a46..6d3ae0771c0 100644
--- a/ace/Method_Request.h
+++ b/ace/Method_Request.h
@@ -44,7 +44,7 @@ public:
 
   // = Accessors.
   /// Get priority.
-  u_long priority (void);
+  u_long priority (void) const;
 
   /// Set priority.
   void priority (u_long);
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 3e0f80fe579..d64d307a277 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -58,6 +58,8 @@ public:
    * the default value of <ACE_Addr::sap_any> then the user is letting
    * the OS do the binding.  If <reuse_addr> == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
+   * The <protocol_family> and <protocol> parameters are passed down
+   * to the <socket> call, whereas <flags> and <perms> are ignored.
    */
   ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                       const ACE_Addr &remote_sap,
@@ -85,6 +87,8 @@ public:
    * <ACE_Addr::sap_any> then the user is letting the OS do the
    * binding.  If <reuse_addr> == 1 then the <local_addr> is reused,
    * even if it hasn't been cleanedup yet.
+   * The <protocol_family> and <protocol> parameters are passed down
+   * to the <socket> call, whereas <flags> and <perms> are ignored.
    */
   ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
                       const ACE_Addr &remote_sap,
@@ -114,6 +118,8 @@ public:
    * the OS do the binding.  If <reuse_addr> == 1 then the
    * <local_addr> is reused, even if it hasn't been cleanedup yet.
    * Note that the <new_stream> always starts out in blocking mode.
+   * The <protocol_family> and <protocol> parameters are passed down
+   * to the <socket> call, whereas <flags> and <perms> are ignored.
    */
   int connect (ACE_SOCK_Stream &new_stream,
                const ACE_Addr &remote_sap,
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 4b8bfe48749..623384a46a3 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -565,8 +565,7 @@ ACE_Sig_Handlers::dump (void) const
 }
 
 // This is the method that does all the dirty work...  The basic
-// structure of this method was devised by Detlef Becker
-// (beckerd@erlh.siemens.de).
+// structure of this method was devised by Detlef Becker.
 
 int
 ACE_Sig_Handlers::register_handler (int signum,
@@ -721,7 +720,7 @@ ACE_Sig_Handlers::remove_handler (int signum,
           // Type-safe downcast would be nice here...
           ACE_Sig_Adapter *sh = (ACE_Sig_Adapter *) *eh;
 
-          // Remove the handler if (1) it's key matches the key we've
+          // Remove the handler if (1) its key matches the key we've
           // been told to remove or (2) if we've been told to remove
           // *all* handlers (i.e., <sigkey> == -1).
 
diff --git a/ace/Signal.h b/ace/Signal.h
index db3c2c66fcc..fc046d0404b 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -440,10 +440,13 @@ public:
                                 ACE_Sig_Action *old_disp = 0);
 
   /**
-   * Remove the ACE_Event_Handler currently associated with <signum>.
-   * Install the new disposition (if given) and return the previous
-   * disposition (if desired by the caller).  Returns 0 on success and
-   * -1 if <signum> is invalid.
+   * Remove an <ACE_Event_Handler> currently associated with <signum>.
+   * We remove the handler if (1) its <sigkey> matches the <sigkey>
+   * passed as a parameter or (2) if we've been told to remove all the
+   * handlers, i.e., <sigkey> == -1.  If a new disposition is given it
+   * is installed and the previous disposition is returned (if desired
+   * by the caller).  Returns 0 on success and -1 if <signum> is
+   * invalid.
    */
   virtual int remove_handler (int signum,
                               ACE_Sig_Action *new_disp = 0,
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
index a41ab2efde5..994c27934d5 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
@@ -21,7 +21,9 @@ static int remote_reconfigure = 0;
 static void 
 print_usage_and_die (void)
 {
-  ACE_ERROR ((LM_ERROR, "usage: %n [-p portnum] [-h host_name] [-r] [-f file]\n%a", 1));
+  ACE_ERROR ((LM_ERROR,
+              "usage: %n [-p portnum] [-h host_name] [-r]\n%a",
+              1));
 }
 
 void
@@ -59,8 +61,14 @@ main (int argc, char *argv[])
   ACE_SOCK_Stream   sc;
   ACE_SOCK_Connector con;
 
-  if (con.connect (sc, ACE_INET_Addr (port_number, host_name)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n%a", "connect", 1), -1);
+  if (con.connect (sc,
+                   ACE_INET_Addr (port_number,
+                                  host_name)) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "%p\n%a",
+                       "connect",
+                       1),
+                      -1);
 
   if (remote_reconfigure)
     // Remotely instruct the server to reconfigure itself.
@@ -68,17 +76,32 @@ main (int argc, char *argv[])
 
   // Send the command.
 
-  if (sc.send_n (buf, ACE_OS::strlen (buf) + 1) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n%a", "send", 1), -1);
+  if (sc.send_n (buf, 
+                 ACE_OS::strlen (buf) + 1) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n%a",
+                       "send",
+                       1), -1);
 
   // Next, read the response.
 
-  while ((n = sc.recv (buf, sizeof buf)) > 0)
-    if (ACE_OS::write (ACE_STDOUT, buf, n) != n)
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n%a", "write", 1), -1);
+  while ((n = sc.recv (buf,
+                       sizeof buf)) > 0)
+    if (ACE_OS::write (ACE_STDOUT,
+                       buf,
+                       n) != n)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%p\n%a",
+                         "write",
+                         1),
+                        -1);
 	 
   if (sc.close () == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n%a", "close", 1), -1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%p\n%a",
+                         "close",
+                         1),
+                        -1);
     
   return 0;
 }