ChangeLogTag: Mon Jun 8 19:18:58 UTC 2009 Adam Mitz <mitza@ociweb.com>

10 files changed, 73 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0218dab54a6..90f0aca6e96 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,44 @@
+Mon Jun  8 19:18:58 UTC 2009  Adam Mitz  <mitza@ociweb.com>
+
+        * MPC/config/taodefaults.mpb:
+
+          Fix a bad comment.
+
+        * docs/compiler.html:
+
+          s/gperf/ace_gperf/ in a few places that must have been missed when
+          the name of this executable was changed a year ago.
+
+        * docs/rtcorba/features.html:
+
+          Fix the name of the -RTORBNetworkPriorityMapping option.
+
+        * orbsvcs/Notify_Service/README:
+
+          Add information about -LoggingInterval and how to use it.
+
+        * orbsvcs/examples/Notify/MC/monitor/monitor.cpp:
+
+          Fix a bug in how Numeric statistics print their last value.
+
+        * tests/Bug_2593_Regression/run_test.pl:
+
+          Use a random port instead of hard-coding :4444.
+
+        * tests/IPV6/run_test.pl:
+
+          This test requires -ORBUseSharedProfile 0, even though it's the
+          default now that might change in the future and it's safer to be
+          explicit.
+
+        * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+
+          Added an "after" needed for the single-threaded configuration.
+
+        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
+
+          Removed this file.  This test doesn't need its own workspace.
+
 Mon Jun  8 06:41:03 UTC 2009  Olli Savia  <ops@iki.fi>
 
         * orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h:
@@ -287,7 +328,7 @@ Tue  Jun  2 06:47:43 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
           strategy for which the default is leader follower, but that
           will not work because we don't use the lf loop in this case.
           Added a note the ClientConnectionHandler RW needs a
-          FlusingStrategy of blocking
+          FlushingStrategy of blocking
 
         * tests/Bug_3683_Regression/Echo_Client_i.cpp
         * tests/Bug_3683_Regression/Echo_Client_i.h
diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb
index bdfac6286fc..8e9f1886884 100644
--- a/TAO/MPC/config/taodefaults.mpb
+++ b/TAO/MPC/config/taodefaults.mpb
@@ -20,7 +20,7 @@ feature(!corba_messaging) {
 }
 
 // If the transport current feature is disabled, then we need
-// to add the TAO_HAS_CORBA_MESSAGING=0 macro onto the command line.
+// to add the TAO_HAS_TRANSPORT_CURRENT=0 macro onto the command line.
 feature(!transport_current) {
   macros += TAO_HAS_TRANSPORT_CURRENT=0
 }
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 856ca124a61..d56552ca306 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -142,14 +142,14 @@ the following:
       that ACE runs on. <P>
 
   <li>Build the <CODE>gperf</CODE> in $ACE_ROOT/apps/gperf.  This build
-      also leaves a copy/link of the gperf program at the $ACE_ROOT/bin
+      also leaves a copy/link of the ace_gperf program at the $ACE_ROOT/bin
       directory.<P>
 
   <li>Set the environment variable $ACE_ROOT appropriately or add
       $ACE_ROOT/bin to your search path. <P>
 
   <li>Use the <CODE>-g</CODE> option for the TAO IDL compiler or set
-      your search path accordingly to install <CODE>gperf</CODE> in a
+      your search path accordingly to install <CODE>ace_gperf</CODE> in a
       directory other than $ACE_ROOT/bin.
 </ul>
 
@@ -496,10 +496,10 @@ also receives other options that are specific to it.<p>
   </TR>
 
   <tr><a name="g">
-    <td><tt>-g</tt></td>
+    <td><tt>-g </tt><i>path</i></td>
 
     <td>To specify the path for the perfect hasing program (GPERF). Default
-        is $ACE_ROOT/bin/gperf.&nbsp;</td>
+        is $ACE_ROOT/bin/ace_gperf.&nbsp;</td>
     <td>&nbsp;</td>
   </tr>
 
diff --git a/TAO/docs/rtcorba/features.html b/TAO/docs/rtcorba/features.html
index 65639d82577..4c217d136ea 100644
--- a/TAO/docs/rtcorba/features.html
+++ b/TAO/docs/rtcorba/features.html
@@ -773,7 +773,7 @@ these TAO supported mappings through the Service Configurator (svc.conf)
 files with the following entry:</dd>
 
 <p>static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS
--ORBPriorityMapping direct <i>-ORBNetworkPriorityMapping Linear</i>"
+-ORBPriorityMapping direct <i>-RTORBNetworkPriorityMapping Linear</i>"
 <br>&nbsp;
 <li>
 <b>Network Priority Mapping Manager</b></li>
diff --git a/TAO/orbsvcs/Notify_Service/README b/TAO/orbsvcs/Notify_Service/README
index c0088d87cd3..bf5387008f2 100644
--- a/TAO/orbsvcs/Notify_Service/README
+++ b/TAO/orbsvcs/Notify_Service/README
@@ -69,7 +69,12 @@ Command line arguments:
                   'corba_messaging' MPC feature during building of the
                   Notify_Service, which is on by default.
 
-!! The -Notify_TPReactor option is deprecated!! use the -RunThreads
+"-LoggingInterval seconds" : Sets up a logging interval timer for the ORB's
+                             reactor.  This is required to use the ACE 
+                             Logging Service features such as file sizing
+                             and rotation.  See the example below.
+
+!! The -Notify_TPReactor option is deprecated!! use the -ORBRunThreads
 option instead.
 
 "-Notify_TPReactor [threads]": Tells the Notify Service that the ORB
@@ -128,6 +133,19 @@ Note that the client uses:
  resolve_initial_references ("NotifyEventChannelFactory");
 to obtain the object reference.
 
+Using the ACE Logging Service:
+------------------------------
+
+Start the Notify_Service executable with the debug options desired and
+the -LoggingInterval option:
+
+./Notify_Service -ORBDebugLevel 10 -ORBVerboseLogging 1 -ORBSvcConf ns.conf -LoggingInterval 5
+
+Configure the logging service in the ns.conf file:
+dynamic Logging_Strategy Service_Object * ACE:_make_ACE_Logging_Strategy() "-s NS -f OSTREAM -t 0 "
+
+
+
 The svc.conf options:
 ----------------------
 
diff --git a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
index 8e3d04c526d..1c9d77bd985 100644
--- a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
+++ b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
@@ -267,7 +267,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                     {
                       ACE_DEBUG ((LM_DEBUG,
                                   "Last: %g Average: %g\n",
-                                  data->data_union.num().dlist[0],
+                                  data->data_union.num().dlist[0].value,
                                   data->data_union.num().average));
                     }
                   else
diff --git a/TAO/tests/Bug_2593_Regression/run_test.pl b/TAO/tests/Bug_2593_Regression/run_test.pl
index be4ae9996d0..8e457643261 100755
--- a/TAO/tests/Bug_2593_Regression/run_test.pl
+++ b/TAO/tests/Bug_2593_Regression/run_test.pl
@@ -20,7 +20,8 @@ foreach $i (@ARGV) {
 $iorfile = PerlACE::LocalFile ("server.ior");
 unlink $iorfile;
 
-$endpoints = "-ORBEndpoint shmiop://12345 -ORBEndpoint iiop://:4444";
+$endpoints = "-ORBEndpoint shmiop://12345 -ORBEndpoint iiop://:"
+    . PerlACE::random_port();
 $debug_conf = "-ORBDebugLevel $debug_level";
 $svc_conf = "-ORBSvcConf server.conf";
 
diff --git a/TAO/tests/IPV6/run_test.pl b/TAO/tests/IPV6/run_test.pl
index 5fd05c3d071..555d35a5fa9 100755
--- a/TAO/tests/IPV6/run_test.pl
+++ b/TAO/tests/IPV6/run_test.pl
@@ -19,6 +19,8 @@ if (PerlACE::is_vxworks_test()) {
 else {
     $srv_arg = "-o $iorfile ";
 }
+
+$srv_arg .= "-ORBUseSharedProfile 0 ";
 $clt_arg = "-k file://$iorfile ";
 
 @configurations =
diff --git a/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc b/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc
deleted file mode 100644
index b9b3417f5ee..00000000000
--- a/TAO/tests/ORB_Local_Config/ORB_Local_Config.mwc
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  lib
-  Bunch
-  Bug_1459
-  Bug_2612
-  Separation
-  Service_Dependency
-  Shared
-  Simple
-  Two_DLL_ORB
-}
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
index 326f3fc69c4..43ea58515d0 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
@@ -39,7 +39,7 @@ project(ORB_DLL_Server) : taolib_with_idl, portableserver, threads {
 }
 
 project(ORB_DLL_Client) : taolib_with_idl, portableserver {
-  after += ORB_DLL_Server
+  after += ORB_DLL_Server *idl
   sharedname   = ORB_DLL_Client
   dynamicflags = SERVICE_CONFIG_ORB_DLL_BUILD_DLL