.

23 files changed, 465 insertions, 337 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 8b5ffc330dc..0bf89429cb8 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,21 @@
+Tue Jun  8 14:43:52 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+        * Fixed the capitalization of all options in TAO's svc.conf files.
+
+	* tao/ORB_Core.cpp,
+	  tao/default_resource.cpp,
+	  tao/default_server.cpp, 
+	  tao/default_client.cpp: Fixed the parsing of options
+	  so that they are case insensitive, e.g., "-ORBsvcconf" is the
+	  same as "-ORBSvcConf".  This allows us to use more intuitive
+	  "intercap" spelling in the documentation without breaking
+	  existing software.
+
+	* tao/ORB_Core.cpp (init): If an non "-ORB" argument is given to
+ 	  ORB_init() we now print a warning message (if the
+ 	  TAO_debug_level > 0) and "consume" the argument.  This is in
+ 	  accordance with the CORBA spec.
+
 Tue Jun  8 15:38:01 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
 	* tao/default_client.cpp (create_transport_mux_strategy): Renamed
@@ -45,15 +63,13 @@ Tue Jun  8 15:09:35 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 Tue Jun  8 15:03:02 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
 	* orbsvcs/tests/Property/client.h:
-	* orbsvcs/tests/Property/client.cpp:
-
-	 Fixed the SunCC5.0 warnings.
+	* orbsvcs/tests/Property/client.cpp: Fixed the SunCC5.0 warnings.
 
 Tue Jun 08 13:36:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tao/Stub.{h,i} (servant_orb): Added data member servant_orb_ and
-	  its accessor and mutator.  This ORB_var stores the pointer of a
-	  collocated servant and is used to locate/query the servant/POA.
+ 	  its accessor and mutator.  This ORB_var stores the pointer of a
+ 	  collocated servant and is used to locate/query the servant/POA.
 
 Mon Jun 07 15:47:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
@@ -61,43 +77,41 @@ Mon Jun 07 15:47:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 	  and -ORBcollocationStrategy.
 
 	* tao/ORB_Core.{h,i,cpp}: Removed accessor/mutator
-	  using_collocation methods.  They have been replaced by
-	  optimize_collocation_objects.
-
-	  Added enum definition for collocation_strategy and
-	  get_collocation_strategy which is an accessor for ORB's
-	  collocation strategy.  TAO will support two strategies THRU_POA
-	  and DIRECT which should be self-explaining.  The default
-	  strategy will be THRU_POA because it is considered the safe
-	  thing to do.  Veteran users might consider using DIRECT
-	  collocation strategy if situation allows.  A third strategy
-	  "ORB_CONTROL" is the default value passed to
-	  Servant_Base::_create_collocated_objref.  This makes all servant
-	  to query the ORB to decide which collocation strategy to use.
-	  But we can also provide per-object collocation strategy in a
-	  later point of time.
+ 	  using_collocation methods.  They have been replaced by
+ 	  optimize_collocation_objects.  Added enum definition for
+ 	  collocation_strategy and get_collocation_strategy which is an
+ 	  accessor for ORB's collocation strategy.  TAO will support two
+ 	  strategies THRU_POA and DIRECT which should be self-explaining.
+  	  The default strategy will be THRU_POA because it is considered
+ 	  the safe thing to do.  Veteran users might consider using DIRECT
+ 	  collocation strategy if situation allows.  A third strategy
+ 	  "ORB_CONTROL" is the default value passed to
+ 	  Servant_Base::_create_collocated_objref.  This makes all servant
+ 	  to query the ORB to decide which collocation strategy to use.
+  	  But we can also provide per-object collocation strategy in a
+ 	  later point of time.
 
 	  (init): Added a new option -ORBcollocationstrategy which takes
-	  two possible values "thru_poa" and "direct".  The defualt is, of
-	  course, "thru_poa".
+ 	  two possible values "thru_poa" and "direct".  The defualt is, of
+ 	  course, "thru_poa".
 
 	* tao/Servant_Base.{h,cpp} (_create_collocated_objref): Added a
-	  factory method to strategize what collocated object
-	  implementation we want to use and also to decouple the stubs and
-	  skeletons code.
+ 	  factory method to strategize what collocated object
+ 	  implementation we want to use and also to decouple the stubs and
+ 	  skeletons code.
 
 	* tao/Exception.h: Reordered class member functions to put all TAO
-	  extensions at the end of the public section of each class.
-	  Added more comments.
+ 	  extensions at the end of the public section of each class.
+  	  Added more comments.
 
 	* tao/Exception.{h,cpp} (_tao_print_exception): Renamed
-	  <print_exception> to _tao_print_exception to avoid clashing with
-	  user defined methods.
+ 	  <print_exception> to _tao_print_exception to avoid clashing with
+ 	  user defined methods.
 	  (_tao_print_system_exception): Renamed <print_exception_tao_> to
-	  _tao_print_system_exception to avoid name clashing.
+ 	  _tao_print_system_exception to avoid name clashing.
 	  (_tao_minor_code,_tao_errno): Rename <minor_code_tao_> and
-	  <errno_tao_> to _tao_minor_code and _tao_errno to avoid name
-	  clashing.
+ 	  <errno_tao_> to _tao_minor_code and _tao_errno to avoid name
+ 	  clashing.
 
 	  Changed several uses of "new" to ACE_NEW_THROW_EX.
 
@@ -111,18 +125,18 @@ Mon Jun 07 15:47:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 	  macros and made sure the code is exception safe.
 
 	* tao/orbconf.h (TAO_NAMESPACE_INLINE_FUNCTION): Inline function
-	  within a namespace must be treated differently.  On most
-	  platform, using TAO_NAMESPACE_STORAGE_CLASS would work for
-	  functions within a namespace.  However, since the macro uses
-	  TAO_Export, which totally confuses MSVC to think that the
-	  symbols for these functions are to be exported while in fact,
-	  they are only inline functions and do not need any entry point
-	  at all.  The newly added macro (TAO_NAMESPACE_INLINE_FUNCTION)
-	  separates out this situation and simply uses the "inline"
-	  keyword.
+ 	  within a namespace must be treated differently.  On most
+ 	  platform, using TAO_NAMESPACE_STORAGE_CLASS would work for
+ 	  functions within a namespace.  However, since the macro uses
+ 	  TAO_Export, which totally confuses MSVC to think that the
+ 	  symbols for these functions are to be exported while in fact,
+ 	  they are only inline functions and do not need any entry point
+ 	  at all.  The newly added macro (TAO_NAMESPACE_INLINE_FUNCTION)
+ 	  separates out this situation and simply uses the "inline"
+ 	  keyword.
 
 	* tao/Marshal.h: Added #include "tao/Principal.h" because
-	  Marshal.i uses inline functions in Principal.i.
+ 	  Marshal.i uses inline functions in Principal.i.
 
         * tao/Context.{i,cpp}:
         * tao/Environment.{i,cpp}:
@@ -140,7 +154,7 @@ Mon Jun 07 15:47:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 Tue Jun 08 14:39:55 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * tao/corbafwd.h,Exception.cpp: added minor code support for
-          ENOENT, EBADF, EPERM, and EAFNOSUPPORT errno values.
+ 	  ENOENT, EBADF, EPERM, and EAFNOSUPPORT errno values.
 
 Tue Jun 08 14:15:52 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 6f5b08296ef..5e296dda4f5 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -104,28 +104,28 @@ while the rest of the options are set via the service configurator
 <TH>Option</TH>
 <TH>Description</TH></TR>
 <!-- <TR NAME="ORBsvcconf"> -->
-<TD><CODE>-ORBsvcconf</CODE> <EM>config file name</EM></TD>
+<TD><CODE>-ORBSvcConf</CODE> <EM>config file name</EM></TD>
 <TD>Specifies the name of the file from which it will read dynamic service configuration
 directives <EM>ala</EM> ACE's Service Configurator.</TD></TR>
-<TD><CODE>-ORBsvcconfdirective</CODE> <EM>directivestring</EM></TD>
+<TD><CODE>-ORBSvcConfDirective</CODE> <EM>directivestring</EM></TD>
 <TD>Specifies a service configuration
 directive, which is passed to ACE's Service Configurator.</TD></TR>
 <TR>
-<TD><CODE>-ORBdaemon</CODE></TD>
+<TD><CODE>-ORBDaemon</CODE></TD>
 <TD>Specifies that the ORB should <I>daemonize</I> itself.</TD></TR>
 <TR>
-<TD><CODE>-ORBdebug</CODE></TD>
+<TD><CODE>-ORBDebug</CODE></TD>
 <TD>Turns on the output of debugging messages within ACE's Service Configurator
 componentry.</TD></TR>
 <TR>
-<TD><CODE>-ORBdebuglevel</CODE> <EM>level</EM></TD>
+<TD><CODE>-ORBDebugLevel</CODE> <EM>level</EM></TD>
 <TD>Control the level of debugging in the ORB. Higher number produce
 more output (try 10).
 </TD></TR>
 <TR>
 
-<TD><CODE>-ORBendpoint</CODE> <EM>endpoint</EM></TD> <TD><a
-name="-ORBendpoint"></a>Tells the ORB to listen for requests on the
+<TD><CODE>-ORBEndpoint</CODE> <EM>endpoint</EM></TD> <TD><a
+name="-ORBEndpoint"></a>Tells the ORB to listen for requests on the
 interface specified by <I><EM>endpoint</EM></I>.  Endpoints are
 specified using a URL style format.  An endpoint has the form:
 <blockquote><CODE>
@@ -136,80 +136,80 @@ each address.  An example of an IIOP endpoint is:
 <blockquote><CODE>
 iiop://<I><EM>hostname</EM></I>:<I><EM>port</EM></I>
 </CODE></blockquote>
-Sets of endpoints may be specified using multiple <CODE>-ORBendpoint</CODE>
+Sets of endpoints may be specified using multiple <CODE>-ORBEndpoint</CODE>
 options or by delimiting endpoints with a semi-colon (;).  For example,
 <blockquote><CODE>
--ORBendpoint iiop://localhost:9999 -ORBendpoint uiop:///tmp/mylocalsock
+-ORBEndpoint iiop://localhost:9999 -ORBEndpoint uiop:///tmp/mylocalsock
 </CODE></blockquote>
 is equivalent to:
 <blockquote><CODE>
--ORBendpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock'
+-ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock'
 </CODE></blockquote>
 Notice the single quotes (') in the latter option specification.  Single
 quotes are needed to prevent the shell from interpreting text after the
 semi-colon as another command to run.<P>
 If an endpoint is specified without an <CODE>addr</CODE> such as the following:
 <blockquote><CODE>
--ORBendpoint uiop://
+-ORBEndpoint uiop://
 </CODE></blockquote>
 then a default endpoint will be created for the specified protocol.
 </TD></TR>
 
 <TR>
 
-<TD><CODE>-ORBhost</CODE> <EM>hostname</EM></TD> <TD><a
-name="-ORBhost"></a>Tells the ORB to listen for requests on the
+<TD><CODE>-ORBHost</CODE> <EM>hostname</EM></TD> <TD><a
+name="-ORBHost"></a>Tells the ORB to listen for requests on the
 interface associated with the host named
 <I><EM>hostname</EM></I>.  This option is valid only for IIOP endpoints.<BR>
 <STRONG>NOTE:</STRONG> This option has been superceded by the
-<CODE>-ORBendpoint</CODE> option. It will not be supported in the
+<CODE>-ORBEndpoint</CODE> option. It will not be supported in the
 future.</TD></TR>
 
 <TR>
 
-<TD><CODE>-ORBport</CODE> <EM>portspec</EM></TD> <TD>Tells the ORB to
+<TD><CODE>-ORBPort</CODE> <EM>portspec</EM></TD> <TD>Tells the ORB to
 listen for requests on the port specified by
 <I><EM>portspec</EM></I>. If not specified, the OS gets to choose a
 random empty port.  This option is valid only for IIOP endpoints.<BR>
 <STRONG>NOTE:</STRONG> This option has been superceded by the
-<CODE>-ORBendpoint</CODE> option. It will not be supported in the
+<CODE>-ORBEndpoint</CODE> option. It will not be supported in the
 future.</TD>
 
 </TR>
 
 <TR>
-<TD><CODE>-ORBobjrefstyle</CODE> <EM>which</EM></TD>
+<TD><CODE>-ORBObjRefStyle</CODE> <EM>which</EM></TD>
 <TD>Specifies the user-visible style of object references. The range of values
 is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
 or <CODE>URL</CODE>, which looks more like a URL.</TD></TR>
 <TR>
-<TD><CODE>-ORBrcvsock</CODE> <EM>receive buffer size</EM></TD>
-<TD><A NAME="-ORBrcvsock"></a>Specify the size of the socket receive buffer as a positive, non-zero integer.
+<TD><CODE>-ORBRcvSock</CODE> <EM>receive buffer size</EM></TD>
+<TD><A NAME="-ORBRcvSock"></a>Specify the size of the socket receive buffer as a positive, non-zero integer.
 If not specified, the ACE_DEFAULT_MAX_SOCKET_BUFSIZ default is used.</TD></TR>
 <TR>
-<TD><CODE>-ORBsndsock</CODE> <EM>send buffer size</EM></TD>
-<TD><A NAME="-ORBsndsock"></a>Specify the size of the socket send buffer as a positive, non-zero integer.
+<TD><CODE>-ORBSndSock</CODE> <EM>send buffer size</EM></TD>
+<TD><A NAME="-ORBSndSock"></a>Specify the size of the socket send buffer as a positive, non-zero integer.
 If not specified, the ACE_DEFAULT_MAX_SOCKET_BUFSIZ default is used.</TD></TR>
 <TR>
-<TD><CODE>-ORBnameserviceport</CODE> <EM>portspec</EM></TD>
+<TD><CODE>-ORBNameServicePort</CODE> <EM>portspec</EM></TD>
 <TD>Specifies which port the Naming Service is listening on for
 multicast requests.</TD></TR>
 <TR>
-<TD><CODE>-ORBnameserviceior</CODE> <EM>ior</EM></TD>
+<TD><CODE>-ORBNameServiceIOR</CODE> <EM>ior</EM></TD>
 <TD>Specifies the IOR for the Naming Service.</TD></TR>
 <TR>
-<TD><CODE>-ORBtradingserviceior"</CODE> <EM>ior</EM></TD>
+<TD><CODE>-ORBTradingServiceIOR"</CODE> <EM>ior</EM></TD>
 <TD>Specifiles the IOR for the Trading Service.</TD></TR>
 <TR>
-<TD><CODE>-ORBtradingserviceport"</CODE> <EM>portspec</EM></TD>
+<TD><CODE>-ORBTradingServicePort"</CODE> <EM>portspec</EM></TD>
 <TD>Specifies to which port the Trading Service is listening on for
     multicast requests.</TD></TR>
 <TR>
-<TD><CODE>-ORBcollocation</CODE> <EM>yes/no</EM></TD>
+<TD><CODE>-ORBCollocation</CODE> <EM>yes/no</EM></TD>
 <TD>Specifies the use of collocation object optimization.  Default is yes.</TD></TR>
 <TR>
   <TD>
-      <CODE>-ORBcollocationstrategy</CODE> <EM>thru_poa/direct</EM>
+      <CODE>-ORBCollocationStrategy</CODE> <EM>thru_poa/direct</EM>
   </TD>
   <TD>
       Specifies what kind of collocated object to use.  If the
@@ -222,7 +222,7 @@ multicast requests.</TD></TR>
 </TR>
 <TR>
   <TD>
-      <CODE>-ORBglobalcollocation</CODE> <EM>yes/no</EM>
+      <CODE>-ORBGlobalCollocation</CODE> <EM>yes/no</EM>
   </TD>
   <TD>
       Specifies whether objects from different ORBs within the same
@@ -231,21 +231,21 @@ multicast requests.</TD></TR>
   </TD>
 </TR>
 <TR>
-<TD><CODE>-ORBpreconnect</CODE> <EM>endpoint</EM></TD>
-<TD><A name="-ORBpreconnect"></a>Pre-establishes a blocking connection to
+<TD><CODE>-ORBPreconnect</CODE> <EM>endpoint</EM></TD>
+<TD><A name="-ORBPreconnect"></a>Pre-establishes a blocking connection to
 each listed <EM>endpoint</EM>. If a connection cannot be established the
 failed preconnection will be ignored and the next preconnection in the list
 will be processed.  Successful and unsuccessful preconnections will be
 displayed if a debugging level greater than or equal to one is specified by
-using the <CODE>-ORBdebuglevel</CODE> option.  Listing the same combination
+using the <CODE>-ORBDebugLevel</CODE> option.  Listing the same combination
 multiple times will properly establish multiple connections to that endpoint.
-The <CODE>-ORBpreconnect</CODE> option uses the same endpoint format as the
-<CODE>-ORBendpoint</CODE> option.  Specifying IIOP endpoints using a comma
+The <CODE>-ORBPreconnect</CODE> option uses the same endpoint format as the
+<CODE>-ORBEndpoint</CODE> option.  Specifying IIOP endpoints using a comma
 delimited list of <EM>host<STRONG>:</STRONG>port</EM> pairs is deprecated
 and will not be supported in the future.</TD></TR>
 <TR>
-<TD><CODE>-ORBcdrtradeoff</CODE> <EM>maxsize</EM></TD>
-<TD><A name="-ORBCDRtradeoff"></a>Control the strategy to tradeoff
+<TD><CODE>-ORBCDRTradeoff</CODE> <EM>maxsize</EM></TD>
+<TD><A name="-ORBCDRTradeoff"></a>Control the strategy to tradeoff
 between copy vs no copy marshalling of octet sequences.
 If an octet sequence is smaller than <EM>maxsize</EM> and the current
 message block contains enough space for it the octet sequence is
@@ -256,14 +256,14 @@ copied instead of appended to the CDR stream.</TD></TR>
 method, which is necessary if the ORB is being linked dynamically via the ACE Service Configurator
 which is not reentrant.</TD></TR>
 <TR>
-<TD><CODE>-ORBgioplite</CODE></TD>
-<TD><A name="-ORBgioplite"></a>Enable a lightweight version of the
+<TD><CODE>-ORBGIOPlite</CODE></TD>
+<TD><A name="-ORBGIOPlite"></a>Enable a lightweight version of the
 	    GIOP protocol. This protocol removes some of the fields in
 	    the GIOP and the Request header. It only works on
 	    homogenous environments..</TD></TR>
 <TR>
-<TD><CODE>-ORBdotteddecimaladdresses</CODE> <EM>boolean (0 / 1)</EM></TD>
-<TD><A name="-ORBdotteddecimaladdresses"></a> Use the dotted decimal
+<TD><CODE>-ORBDottedDecimalAddresses</CODE> <EM>boolean (0 / 1)</EM></TD>
+<TD><A name="-ORBDottedDecimalAddresses"></a> Use the dotted decimal
             notation for addresses.</TD></TR>
 <TR>
 <TD><CODE>-ORBInitRef</CODE> <EM>ObjectId=IOR</EM></TD>
@@ -285,23 +285,23 @@ which is not reentrant.</TD></TR>
 <TH>Option</TH>
 <TH>Description</TH></TR>
 <TR>
-<TD><CODE>-ORBresources</CODE> <EM>which</EM></TD>
+<TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
 <TD>Specify whether each thread uses a global
 (<em>which</em> = <code>global</code>) or a thread-specific
 (<em>which</em> = <code>tss</code>) instance for the resources it returns.</TD></TR>
 <TR>
-<TD><CODE>-ORBreactorlock</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBreactorlock"></a>Specify whether the ORB reactor is
+<TD><CODE>-ORBReactorLock</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBReactorLock"></a>Specify whether the ORB reactor is
 	      thread-safe
 (<em>which</em> = <code>token</code>) or not
 (<em>which</em> = <code>null</code>).  Default is <code>token</code>.
 	      <P>This option has been superseeded by
-		<CODE>-ORBreactortype</CODE>
+		<CODE>-ORBReactorType</CODE>
 	      </P>
 </TD></TR>
 <TR>
-<TD><CODE>-ORBreactortype</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBcoltable"></a>Specify what kind of reactor does the
+<TD><CODE>-ORBReactorType</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBColTable"></a>Specify what kind of reactor does the
 	      ORB use, the options are:
   <TABLE BORDER="1" CELLSPACING="2" CELLPADDING="0">
   <TR><TH><em>which</em></TH><TH>Reactor</TH></TR>
@@ -330,13 +330,13 @@ which is not reentrant.</TD></TR>
   </TABLE>
   The default is <code>select_mt</code></TD></TR>
 <TR>
-<TD><CODE>-ORBcoltable</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBcoltable"></a>Specify whether each ORB uses a global
+<TD><CODE>-ORBColTable</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBColTable"></a>Specify whether each ORB uses a global
 (<em>which</em> = <code>global</code>) or a per-ORB
 (<em>which</em> = <code>orb</code>) collocation table.</TD></TR>
 <TR>
-<TD><CODE>-ORBinputcdrallocator</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBinputcdrallocator"></a>
+<TD><CODE>-ORBInputCDRAllocator</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBInputCDRAllocator"></a>
 	      Specify whether the ORB uses a global
 	      (<em>which</em> = <code>global</code>)
 	      or a per-thread (<em>which</em> = <code>tss</code>)
@@ -357,8 +357,8 @@ which is not reentrant.</TD></TR>
 
 <H3><CODE>TAO_Default_Server_Strategy_Factory</CODE><A NAME="DefaultServer"></A></H3>
 
-<p><em>Note:</em> <code>-ORBdemuxstrategy</code> flag has been changed to <code>-ORBsystemidpolicydemuxstrategy</code> and <code>-ORBuseridpolicydemuxstrategy</code>.
-<p><em>Note:</em> <code>-ORBtablesize</code> flag has been changed to <code>-ORBactiveobjectmapsize</code>.
+<p><em>Note:</em> <code>-ORBDemuxStrategy</code> flag has been changed to <code>-ORBSystemidPolicyDemuxStrategy</code> and <code>-ORBUseridPolicyDemuxStrategy</code>.
+<p><em>Note:</em> <code>-ORBTableSize</code> flag has been changed to <code>-ORBActiveObjectMapSize</code>.
 
 <blockquote>
 <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
@@ -367,38 +367,38 @@ which is not reentrant.</TD></TR>
 <TH>Description</TH></TR>
 <TR>
 
-<TD><CODE>-ORBconcurrency</CODE> <EM>which</EM></TD> <TD>Specify which
+<TD><CODE>-ORBConcurrency</CODE> <EM>which</EM></TD> <TD>Specify which
 concurrency strategy to use.  Range of values is <code>reactive</code>
 for a purely Reactor-driven concurrency strategy or
 <code>thread-per-connection</code> for creating a new thread to
 service each connection.</TD></TR> <TR>
 
-<TD><CODE>-ORBactiveobjectmapsize</CODE> <EM>active object map
+<TD><CODE>-ORBActiveObjectMapSize</CODE> <EM>active object map
 size</EM></TD> <TD>Specify the size of the active object map. If not
 specified, the default value is 64.</TD></TR> <TR>
 
-<TD><CODE>-ORBuseridpolicydemuxstrategy</CODE> <EM>user id policy
+<TD><CODE>-ORBUseridPolicyDemuxStrategy</CODE> <EM>user id policy
 based demultiplexing strategy</EM></TD> <TD>Specify the demultiplexing
 lookup strategy to be used with the user id policy.  The
 <EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE> or
 <CODE>linear</CODE>.  This option defaults to use the
 <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
 
-<TD><CODE>-ORBsystemidpolicydemuxstrategy</CODE> <EM>system id policy
+<TD><CODE>-ORBSystemidPolicyDemuxStrategy</CODE> <EM>system id policy
 based demultiplexing strategy</EM></TD> <TD>Specify the demultiplexing
 lookup strategy to be used with the system id policy. The
 <EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE>,
 <CODE>linear</CODE>, or <CODE>active</CODE>. This option defaults to
 use the <CODE>active</CODE> strategy. </TD></TR> <TR>
 
-<TD><CODE>-ORBuniqueidpolicyreversedemuxstrategy</CODE> <EM>unique id
+<TD><CODE>-ORBUniqueidPolicyReverseDemuxStrategy</CODE> <EM>unique id
 policy based reverse demultiplexing strategy</EM></TD> <TD>Specify the
 reverse demultiplexing lookup strategy to be used with the unique id
 policy. The <EM>reverse demultiplexing strategy</EM> can be one of
 <CODE>dynamic</CODE> or <CODE>linear</CODE>. This option defaults to
 use the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
 
-<TD><CODE>-ORBallowreactivationofsystemids</CODE> <EM>allows
+<TD><CODE>-ORBAllowReactivationOfSystemids</CODE> <EM>allows
 reactivation of system ids</EM></TD> <TD>Specify whether system ids
 can be reactivated, i.e., once an id that was generated by the system
 has be deactivated, will the user reactivate a new servant using the
@@ -409,27 +409,27 @@ and some memory on the server side can be saved. The
 <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
 <TR>
 
-<TD><CODE>-ORBactivehintinids</CODE> <EM>adds an active hint in
+<TD><CODE>-ORBActiveHintInIds</CODE> <EM>adds an active hint in
 ids</EM></TD> <TD>Specify whether an active hint should be added to
 ids. With active hints, ids can be found quickly.  However, they lead
 to larger IORs. Note that this option is disregarded
-<CODE>-ORBallowreactivationofsystemids</CODE> is set to
-<CODE>0</CODE>. The <EM>-ORBactivehintinids</EM> can be <CODE>0</CODE>
+<CODE>-ORBAllowReactivationOfSystemids</CODE> is set to
+<CODE>0</CODE>. The <EM>-ORBActiveHintInIds</EM> can be <CODE>0</CODE>
 or <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
 <TR>
 
-<TD><CODE>-ORBpoamapsize</CODE> <EM>poa map size</EM></TD> <TD>Specify
+<TD><CODE>-ORBPoaMapSize</CODE> <EM>poa map size</EM></TD> <TD>Specify
 the size of the poa map. If not specified, the default value is
 24.</TD></TR> <TR>
 
-<TD><CODE>-ORBpersiententidpolicydemuxstrategy</CODE> <EM>persistent
+<TD><CODE>-ORBPersiententidPolicyDemuxStrategy</CODE> <EM>persistent
 id policy based demultiplexing strategy</EM></TD> <TD>Specify the
 demultiplexing lookup strategy to be used with the persistent id
 policy.  The <EM>demultiplexing strategy</EM> can be one of
 <CODE>dynamic</CODE> or <CODE>linear</CODE>.  This option defaults to
 use the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
 
-<TD><CODE>-ORBtransientidpolicydemuxstrategy</CODE> <EM>transient id
+<TD><CODE>-ORBTransientidPolicyDemuxStrategy</CODE> <EM>transient id
 policy based demultiplexing strategy</EM></TD> <TD>Specify the
 demultiplexing lookup strategy to be used with the transient id
 policy. The <EM>demultiplexing strategy</EM> can be one of
@@ -437,38 +437,38 @@ policy. The <EM>demultiplexing strategy</EM> can be one of
 <CODE>active</CODE>. This option defaults to use the
 <CODE>active</CODE> strategy. </TD></TR> <TR>
 
-<TD><CODE>-ORBactivehintinpoanames</CODE> <EM>adds an active hint in
+<TD><CODE>-ORBActiveHintInPOANames</CODE> <EM>adds an active hint in
 poa names</EM></TD> <TD>Specify whether an active hint should be added
 to poa names. With active hints, poa names can be found quickly.
 However, they lead to larger IORs. The
-<EM>-ORBactivehintinpoanames</EM> can be <CODE>0</CODE> or
+<EM>-ORBActiveHintInPOANames</EM> can be <CODE>0</CODE> or
 <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
 <TR>
 
-<TD><CODE>-ORBthreadflags</CODE> <EM>thread flags</EM></TD>
+<TD><CODE>-ORBThreadFlags</CODE> <EM>thread flags</EM></TD>
 <TD>Specify the flags used for thread creation. Flags can be any
 logical-OR combination of <CODE>THR_DETACHED</CODE>,
 <CODE>THR_BOUND</CODE>, <CODE>THR_NEW_LWP</CODE>,
 <CODE>THE_SUSPENDED</CODE>.</TD></TR> <TR>
 
-<TD><CODE>-ORBpoalock</CODE> <EM>lock type</EM></TD> <TD><a
-name="-ORBpoalock"></a>Specify the type of lock to be used for POA
+<TD><CODE>-ORBPOALock</CODE> <EM>lock type</EM></TD> <TD><a
+name="-ORBPOALock"></a>Specify the type of lock to be used for POA
 accesses.  Possible values for <em>lock type</em> are
 <code>thread</code>, which specifies that an inter-thread mutex is
 used to guarantee exclusive acccess, and <code>null</code>, which
 specifies that no locking be performed.  The default is
 <code>thread</code>.</TD></TR> <TR>
 
-<TD><CODE>-ORBcoltbllock</CODE> <EM>lock type</EM></TD> <TD><a
-name="-ORBcoltbllock"></a>Specify the type of lock to be used for the
+<TD><CODE>-ORBColTblLock</CODE> <EM>lock type</EM></TD> <TD><a
+name="-ORBColTblLock"></a>Specify the type of lock to be used for the
 global collocation table.  Possible values for <em>lock type</em> are
 <code>thread</code>, which specifies that an inter-thread mutex is
 used to guarantee exclusive acccess, and <code>null</code>, which
 specifies that no locking be performed.  The default is
 <code>thread</code>.</TD></TR> <TR>
 
-<TD><CODE>-ORBconnectorlock</CODE> <EM>lock type</EM></TD> <TD><a
-name="-ORBconnectorlock"></a>Specify the type of lock to be used by
+<TD><CODE>-ORBConnectorLock</CODE> <EM>lock type</EM></TD> <TD><a
+name="-ORBConnectorLock"></a>Specify the type of lock to be used by
 the connector.  Possible values for <em>lock type</em> are
 <code>thread</code>, which specifies that an inter-thread mutex is
 used to guarantee exclusive acccess, and <code>null</code>, which
@@ -487,7 +487,7 @@ specifies that no locking be performed.  The default is
 <TH>Option</TH>
 <TH>Description</TH></TR>
 <TR>
-<TD><CODE>-ORBiiopprofilelock</CODE> <EM>which</EM></TD>
+<TD><CODE>-ORBIIOPProfileLock</CODE> <EM>which</EM></TD>
 <TD>
 Specify, whether to use a lock for accessing the IIOP Profile or not.
 Default is <code>thread</code>, which means that a lock is used. The
@@ -496,9 +496,9 @@ This makes sense in case of optiziations 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</EM></TD>
+<TD><CODE>-ORBClientConnectionHandler</CODE> <EM>MT / ST / RW</EM></TD>
 
-<TD><A name="-ORBclientconnectionhandler"></a>
+<TD><A name="-ORBClientConnectionHandler"></a>
 
 ST means use the single-threaded client connection handler, i.e., the
 leader follower model will not be used.  However, ST does support
diff --git a/TAO/examples/POA/Identity/svc.conf b/TAO/examples/POA/Identity/svc.conf
index f58fc4ea337..21b46f90b5d 100644
--- a/TAO/examples/POA/Identity/svc.conf
+++ b/TAO/examples/POA/Identity/svc.conf
@@ -3,4 +3,4 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Server_Strategy_Factory "-ORBuseridpolicydemuxstrategy dynamic -ORBsystemidpolicydemuxstrategy active -ORBuniqueidpolicyreversedemuxstrategy dynamic -ORBallowreactivationofsystemids 1 -ORBactivehintinids 1"
+static Server_Strategy_Factory "-ORBUseridPolicyDemuxStrategy dynamic -ORBSystemidPolicyDemuxStrategy active -ORBUniqueidPolicyReverseDemuxStrategy dynamic -ORBAllowReactivationOfSystemids 1 -ORBActiveHintInIds 1"
diff --git a/TAO/examples/POA/On_Demand_Loading/svc.conf b/TAO/examples/POA/On_Demand_Loading/svc.conf
index a5a704c4cdc..7b853699390 100644
--- a/TAO/examples/POA/On_Demand_Loading/svc.conf
+++ b/TAO/examples/POA/On_Demand_Loading/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
diff --git a/TAO/examples/Simulator/DOVEMIB/svc.conf b/TAO/examples/Simulator/DOVEMIB/svc.conf
index eb4772f319e..e1aa19dda47 100644
--- a/TAO/examples/Simulator/DOVEMIB/svc.conf
+++ b/TAO/examples/Simulator/DOVEMIB/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBDemuxStrategy dynamic -ORBTableSize 128"
diff --git a/TAO/examples/Simulator/Event_Supplier/svc.conf b/TAO/examples/Simulator/Event_Supplier/svc.conf
index eb4772f319e..e1aa19dda47 100644
--- a/TAO/examples/Simulator/Event_Supplier/svc.conf
+++ b/TAO/examples/Simulator/Event_Supplier/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBDemuxStrategy dynamic -ORBTableSize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
index 52fbde787d4..530559f6abb 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
@@ -1,6 +1,6 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
index a5a704c4cdc..7b853699390 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
index e25db66486f..10de97f7b43 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
@@ -1,6 +1,6 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-###static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+###static Server_Strategy_Factory "-ORBConcurrency reactive -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
diff --git a/TAO/orbsvcs/tests/ImplRepo/svc.conf b/TAO/orbsvcs/tests/ImplRepo/svc.conf
index d5e0059859d..fe3d28f349b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/svc.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/svc.conf
@@ -1,4 +1,4 @@
 # $Id$
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBTableSize 128"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index 558c0067bc8..5f5bcf8ff92 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBresources tss -ORBreactortype select_st"
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBpoalock null -ORBconnectorlock null"
+static Resource_Factory "-ORBResources tss -ORBReactorType select_st"
+static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler ST"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null -ORBConnectorLock null"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 3e062048b55..707a303cb04 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBresources global -ORBreactortype select_st -ORBinputcdrallocator tss"
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator tss"
+static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index bc5a4a453fa..2dcac6ab6e6 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBresources tss -ORBinputcdrallocator tss"
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
+static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator tss"
+static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
index 3b74c04dbcc..d175c0d546b 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
@@ -1,2 +1,2 @@
-static Server_Strategy_Factory "-ORBpoalock null -ORBtablesize 1001"
+static Server_Strategy_Factory "-ORBPOALock null -ORBTableSize 1001"
 
diff --git a/TAO/performance-tests/Thruput/TAO/svc.conf b/TAO/performance-tests/Thruput/TAO/svc.conf
index 4f71ac35709..d0573388b31 100644
--- a/TAO/performance-tests/Thruput/TAO/svc.conf
+++ b/TAO/performance-tests/Thruput/TAO/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 51671c1ed5c..9fd010280e1 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1279,9 +1279,10 @@ CORBA::ORB_init (int &argc,
         {
           char *current_arg = arg_shifter.get_current ();
 
-          const char orbid_opt[] = "-ORBid";
+          const char orbid_opt[] = "-ORBId";
           const int orbid_len = sizeof (orbid_opt) - 1;
-          if (ACE_OS::strcmp (current_arg, orbid_opt) == 0)
+          if (ACE_OS::strcmp (current_arg,
+                              orbid_opt) == 0)
             {
               arg_shifter.consume_arg ();
               if (arg_shifter.is_parameter_next ())
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index a98ca9b749b..2e6b925bad5 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -229,7 +229,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
     {
       char *current_arg = arg_shifter.get_current ();
 
-      if (ACE_OS::strcmp (current_arg, "-ORBsvcconf") == 0)
+      if (ACE_OS::strcasecmp (current_arg,
+                              "-ORBSvcConf") == 0)
         {
           // Specify the name of the svc.conf file to be used.
           svc_config_argv[svc_config_argc++] =
@@ -243,14 +244,16 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBdaemon") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBDaemon") == 0)
         {
           // Be a daemon
           svc_config_argv[svc_config_argc++] =
             CORBA::string_dup ("-b");
           arg_shifter.consume_arg ();
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBdotteddecimaladdresses") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBDottedDecimalAddresses") == 0)
         {
           // Use dotted decimal addresses
           // @@ this should be renamed.  See above comment. fredk
@@ -261,14 +264,16 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBdebug") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBDebug") == 0)
         {
           // Turn on debugging
           ACE::debug (1);
           TAO_orbdebug = 1;
           arg_shifter.consume_arg ();
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBdebuglevel") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBDebugLevel") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -280,7 +285,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 
-      else if (ACE_OS::strcmp (current_arg, "-ORBendpoint") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBEndpoint") == 0)
         {
           // Each "endpoint" is of the form:
           //
@@ -320,7 +326,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 
-      else if (ACE_OS::strcmp (current_arg, "-ORBhost") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBHost") == 0)
         {
           // @@ Fred&Carlos: This option now has the same effect as specifying
           //                 an extra -ORBendpoint.  Ideally, this option
@@ -347,7 +354,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBnameserviceior") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBNameServiceIOR") == 0)
         {
           // Specify the IOR of the NameService.
 
@@ -358,7 +366,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBnameserviceport") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBNameServicePort") == 0)
         {
           // Specify the port number for the NameService.
           // Unrelated to ORB Protocols, this is used for multicast.
@@ -370,7 +379,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBtradingserviceior") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBTradingServiceIOR") == 0)
         {
           // Specify the IOR of the NameService.
 
@@ -381,7 +391,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBtradingserviceport") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBTradingServicePort") == 0)
         {
           // Specify the port number for the NameService.
 
@@ -392,15 +403,16 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBport") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBPort") == 0)
         {
           // Issue a warning since this backward compatibilty support
           // may be dropped in future releases.
 
           old_style_endpoint = 1;
           ACE_DEBUG ((LM_WARNING,
-                      "(%P|%t) \nWARNING: The `-ORBport' option is obsolete.\n"
-                      "In the future, use the `-ORBendpoint' option.\n"));
+                      "(%P|%t) \nWARNING: The `-ORBPort' option is obsolete.\n"
+                      "In the future, use the `-ORBEndpoint' option.\n"));
 
           // Specify the port number/name on which we should listen
           arg_shifter.consume_arg ();
@@ -412,7 +424,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBrcvsock") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBRcvSock") == 0)
         {
           // @@ All protocol implementation may not use sockets, so
           //    this can either be a generic I/O Buffer size or
@@ -427,7 +440,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBsndsock") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBSndSock") == 0)
         {
           // @@ All protocol implementation may not use sockets, so
           //    this can either be a generic I/O Buffer size or
@@ -441,7 +455,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBobjrefstyle") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBObjRefStyle") == 0)
         {
           // Specifies the style of printed objrefs: URL or IOR
           //
@@ -466,14 +481,16 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           if (arg_shifter.is_parameter_next ())
             {
               char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "URL") == 0)
+              if (ACE_OS::strcasecmp (opt,
+                                      "URL") == 0)
                 use_ior = 0;
 
               arg_shifter.consume_arg ();
             }
         }
 
-      else if (ACE_OS::strcmp (current_arg, "-ORBcollocation") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBCollocation") == 0)
         // Specify whether we want to optimize against collocation
         // objects.  Valid arguments are: "yes" and "no".  Default is
         // yes.
@@ -482,9 +499,11 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           if (arg_shifter.is_parameter_next ())
             {
               char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "YES") == 0)
+              if (ACE_OS::strcasecmp (opt,
+                                      "YES") == 0)
                 this->opt_for_collocation_ = 1;
-              else if (ACE_OS::strcasecmp (opt, "NO") == 0)
+              else if (ACE_OS::strcasecmp (opt,
+                                           "NO") == 0)
                 this->opt_for_collocation_ = 0;
 
               arg_shifter.consume_arg ();
@@ -511,7 +530,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
       //    file?  And could you also remove from the .html file the
       //    stuff we took out of the default server strategy factory
       //    and the default resource factory?
-      else if (ACE_OS::strcmp (current_arg, "-ORBglobalcollocation") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBGlobalCollocation") == 0)
         // Specify whether we want to use collocation across ORBs;
         // i.e. all the ORBs in the same address space use collocated
         // calls.
@@ -520,16 +540,19 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           if (arg_shifter.is_parameter_next ())
             {
               char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "YES") == 0)
+              if (ACE_OS::strcasecmp (opt,
+                                      "YES") == 0)
                 this->use_global_collocation_ = 1;
-              else if (ACE_OS::strcasecmp (opt, "NO") == 0)
+              else if (ACE_OS::strcasecmp (opt,
+                                           "NO") == 0)
                 this->use_global_collocation_ = 0;
 
               arg_shifter.consume_arg ();
             }
         }
 
-      else if (ACE_OS::strcmp (current_arg, "-ORBpreconnect") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBPreconnect") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -582,7 +605,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 
-      else if (ACE_OS::strcmp (current_arg, "-ORBcdrtradeoff") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBCDRTradeoff") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
@@ -591,7 +615,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-       else if (ACE_OS::strcmp (current_arg, "-ORBsvcconfdirective") == 0)
+       else if (ACE_OS::strcasecmp (current_arg,
+                                    "-ORBSvcConfDirective") == 0)
          {
            // This is used to pass arguments to the Service
            // Configurator using the "command line" to provide
@@ -609,7 +634,8 @@ TAO_ORB_Core::init (int &argc, char *argv[])
                arg_shifter.consume_arg ();
              }
          }
-      else if (ACE_OS::strcmp (current_arg, "-ORBgioplite") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBGIOPlite") == 0)
         {
           // @@ This will have to change since gioplite will be considered
           //    as an alternate ORB messaging protocols.
@@ -620,20 +646,23 @@ TAO_ORB_Core::init (int &argc, char *argv[])
       // A new <ObjectID>:<IOR> mapping has been specified. This will be
       // used by the resolve_initial_references ().
 
-      else if (ACE_OS::strcmp (current_arg, "-ORBInitRef") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBInitRef") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
             {
               init_ref = arg_shifter.get_current ();
-              if (this->add_to_ior_table (init_ref,*ior_lookup_table) != 0)
+              if (this->add_to_ior_table (init_ref,
+                                          *ior_lookup_table) != 0)
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    "Unable to add IOR to the Table\n"),
                                   -1);
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBDefaultInitRef") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBDefaultInitRef") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
@@ -642,13 +671,19 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBSkipServiceConfigOpen") == 0)
+      else if (ACE_OS::strcasecmp (current_arg,
+                                   "-ORBSkipServiceConfigOpen") == 0)
         {
           arg_shifter.consume_arg ();
           skip_service_config_open = 1;
         }
       else
-        arg_shifter.ignore_arg ();
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "warning: arg %s unknown, consuming arg\n"));
+          arg_shifter.consume_arg ();
+        }
     }
 
 #if defined (DEBUG)
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 3c039153ac7..cf3ed9b2f81 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -55,51 +55,55 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
 
   for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
     {
-      if (ACE_OS::strcmp (argv[curarg], "-ORBiiopprofilelock") == 0)
+      if (ACE_OS::strcasecmp (argv[curarg],
+                              "-ORBIIOPProfileLock") == 0)
         {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "thread") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "thread") == 0)
               this->iiop_profile_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name, "null") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "null") == 0)
               this->iiop_profile_lock_type_ = TAO_NULL_LOCK;
           }
         }
 
-      else if (ACE_OS::strcmp (argv[curarg], "-ORBclientconnectionhandler") == 0)
+      else if (ACE_OS::strcasecmp (argv[curarg],
+                                   "-ORBClientConnectionHandler") == 0)
         {
           curarg++;
           if (curarg < argc)
             {
               char *name = argv[curarg];
 
-              if (ACE_OS::strcasecmp (name, "MT") == 0)
-                {
-                  this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
-                }
-              else if (ACE_OS::strcasecmp (name, "ST") == 0)
-                {
-                  this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
-                }
-              else if (ACE_OS::strcasecmp (name, "RW") == 0)
-                {
-                  this->wait_strategy_ = TAO_WAIT_ON_READ;
-                }
+              if (ACE_OS::strcasecmp (name,
+                                      "MT") == 0)
+                this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
+              else if (ACE_OS::strcasecmp (name,
+                                           "ST") == 0)
+                this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
+              else if (ACE_OS::strcasecmp (name,
+                                           "RW") == 0)
+                this->wait_strategy_ = TAO_WAIT_ON_READ;
             }
         }
-      else if (ACE_OS::strcmp (argv[curarg], "-ORBTransportMuxStrategy") == 0)
+      else if (ACE_OS::strcmp (argv[curarg],
+                               "-ORBTransportMuxStrategy") == 0)
         {
           curarg++;
           if (curarg < argc)
             {
               char *name = argv[curarg];
 
-              if (ACE_OS::strcasecmp (name, "MUXED") == 0)
+              if (ACE_OS::strcasecmp (name,
+                                      "MUXED") == 0)
                 this->transport_mux_strategy_ = TAO_MUXED_TMS;
-              else if (ACE_OS::strcasecmp (name, "EXCLUSIVE") == 0)
+              else if (ACE_OS::strcasecmp (name,
+                                           "EXCLUSIVE") == 0)
                 this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
             }
         }
@@ -110,7 +114,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
 ACE_Lock *
 TAO_Default_Client_Strategy_Factory::create_iiop_profile_lock (void)
 {
-  ACE_Lock* the_lock = 0;
+  ACE_Lock *the_lock = 0;
 
   if (this->iiop_profile_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
@@ -137,17 +141,13 @@ TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (void)
   TAO_Transport_Mux_Strategy *tms = 0;
 
   if (this->transport_mux_strategy_ == TAO_MUXED_TMS)
-    {
-      ACE_NEW_RETURN (tms,
-                      TAO_Muxed_TMS,
-                      0);
-    }
+    ACE_NEW_RETURN (tms,
+                    TAO_Muxed_TMS,
+                    0);
   else
-    {
-      ACE_NEW_RETURN (tms,
-                      TAO_Exclusive_TMS,
-                      0);
-    }
+    ACE_NEW_RETURN (tms,
+                    TAO_Exclusive_TMS,
+                    0);
 
   return tms;
 }
@@ -158,23 +158,17 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
   TAO_Wait_Strategy *ws = 0;
 
   if (this->wait_strategy_ == TAO_WAIT_ON_READ)
-    {
-      ACE_NEW_RETURN (ws,
-                      TAO_Wait_On_Read (transport),
-                      0);
-    }
+    ACE_NEW_RETURN (ws,
+                    TAO_Wait_On_Read (transport),
+                    0);
   else if (this->wait_strategy_ == TAO_WAIT_ON_REACTOR)
-    {
-      ACE_NEW_RETURN (ws,
-                      TAO_Wait_On_Reactor (transport),
-                      0);
-    }
+    ACE_NEW_RETURN (ws,
+                    TAO_Wait_On_Reactor (transport),
+                    0);
   else
-    {
-      ACE_NEW_RETURN (ws,
-                      TAO_Wait_On_Leader_Follower (transport),
-                      0);
-    }
+    ACE_NEW_RETURN (ws,
+                    TAO_Wait_On_Leader_Follower (transport),
+                    0);
 
   return ws;
 }
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 10d44e7f063..122f8d38627 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -40,9 +40,7 @@ TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
          this->protocol_factories_.begin ();
        iterator != end;
        ++iterator)
-    {
-      delete *iterator;
-    }
+    delete *iterator;
 
   this->protocol_factories_.reset ();
 }
@@ -73,61 +71,74 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
   int local_resource_source = -1;
 
   for (int curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcmp (argv[curarg], "-ORBresources") == 0)
+    if (ACE_OS::strcasecmp (argv[curarg],
+                            "-ORBResources") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "global") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "global") == 0)
               local_resource_source = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "tss") == 0)
               local_resource_source = TAO_TSS;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoa") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBPOA") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "global") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "global") == 0)
               local_poa_source = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "tss") == 0)
               local_poa_source = TAO_TSS;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBreactorlock") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBReactorLock") == 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Default_Resource obsolete -ORBreactorlock "
-                    "option, please use -ORBreactortype\n"));
+                    "TAO_Default_Resource obsolete -ORBReactorLock "
+                    "option, please use -ORBReactorType\n"));
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "null") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "null") == 0)
               reactor_type_ = TAO_REACTOR_SELECT_MT;
-            else if (ACE_OS::strcasecmp (name, "token") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "token") == 0)
               reactor_type_= TAO_REACTOR_SELECT_ST;
           }
       }
 
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBreactortype") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBReactorType") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "select_mt") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "select_mt") == 0)
               reactor_type_ = TAO_REACTOR_SELECT_MT;
-            else if (ACE_OS::strcasecmp (name, "select_st") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "select_st") == 0)
               reactor_type_ = TAO_REACTOR_SELECT_ST;
-            else if (ACE_OS::strcasecmp (name, "fl_reactor") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "fl_reactor") == 0)
 #if defined(ACE_HAS_FL)
               reactor_type_ = TAO_REACTOR_FL;
 #else
@@ -135,7 +146,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           "TAO_Default_Factory - FlReactor"
                           " not supported on this platform\n"));
 #endif /* ACE_HAS_FL */
-            else if (ACE_OS::strcasecmp (name, "xt_reactor") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "xt_reactor") == 0)
 #if defined(ACE_HAS_XT)
               reactor_type_ = TAO_REACTOR_XT;
 #else
@@ -143,7 +155,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           "TAO_Default_Factory - XtReactor"
                           " not supported on this platform\n"));
 #endif /* ACE_HAS_XT */
-            else if (ACE_OS::strcasecmp (name, "WFMO") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "WFMO") == 0)
 #if defined(ACE_WIN32)
               reactor_type_ = TAO_REACTOR_WFMO;
 #else
@@ -151,7 +164,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           "TAO_Default_Factory - WFMO Reactor"
                           " not supported on this platform\n"));
 #endif /* ACE_WIN32 */
-            else if (ACE_OS::strcasecmp (name, "MsgWFMO") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "MsgWFMO") == 0)
 #if defined(ACE_WIN32)
               reactor_type_ = TAO_REACTOR_MSGWFMO;
 #else
@@ -166,54 +180,60 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
           }
       }
 
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBinputcdrallocator") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBInputCDRAllocator") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "global") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "global") == 0)
               this->cdr_allocator_source_ = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "tss") == 0)
               this->cdr_allocator_source_ = TAO_TSS;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBprotocolfactory") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBProtocolFactory") == 0)
       {
         TAO_ProtocolFactorySet *pset = this->get_protocol_factories ();
         curarg++;
         if (curarg < argc)
           {
-            TAO_Protocol_Item *item = new TAO_Protocol_Item (argv[curarg]);
+            TAO_Protocol_Item *item;
+            ACE_NEW_RETURN (item,
+                            TAO_Protocol_Item (argv[curarg]),
+                            -1);
             if (pset->insert (item) == -1)
-              {
-                ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) Unable to add protocol factories for %s: %p\n", argv[curarg]));
-              }
+              ACE_ERROR ((LM_ERROR,
+                          "(%P|%t) Unable to add protocol factories for %s: %p\n",
+                          argv[curarg]));
           }
       }
 
   // Don't allow a global ORB and a tss POA.
-  if ( (local_resource_source == TAO_GLOBAL) &&
-       (local_poa_source == TAO_TSS) )
+  if (local_resource_source == TAO_GLOBAL
+      && local_poa_source == TAO_TSS)
     return -1;
 
-  // make poa=tss the default, if ORB is tss and the user didn't
+  // Make poa=tss the default, if ORB is tss and the user didn't
   // specify a value.
-  if ( (local_resource_source == TAO_TSS) &&
-       (local_poa_source      == -1) )
+  if (local_resource_source == TAO_TSS
+      && local_poa_source == -1)
     local_poa_source = TAO_TSS;
 
-  // update the object data members.
+  // Update the object data members.
   if (local_resource_source != -1)
     this->resource_source_ = local_resource_source;
   if (local_poa_source != -1)
-    this->poa_source_      = local_poa_source;
+    this->poa_source_ = local_poa_source;
 
   // Don't allow a global ORB and a tss POA.
-  if ( (this->resource_source_ == TAO_GLOBAL) &&
-       (this->poa_source_      == TAO_TSS) )
+  if (this->resource_source_ == TAO_GLOBAL
+      && this->poa_source_ == TAO_TSS)
     return -1;
 
   return 0;
@@ -225,8 +245,8 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
   TAO_ProtocolFactorySetItor end = protocol_factories_.end ();
   TAO_ProtocolFactorySetItor factory = protocol_factories_.begin ();
 
-  // @@ Ossama, if you want to be very paranoid, you could get memory leak
-  // if insert operations failed.
+  // @@ Ossama, if you want to be very paranoid, you could get memory
+  // leak if insert operations failed.
 
   if (factory == end)
     {
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 78117acf68e..c961a8df541 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -81,11 +81,11 @@ TAO_Default_Server_Strategy_Factory::create_event_loop_lock (void)
 
   if (this->event_loop_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
+                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
                     0);
   else
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> (),
+                    ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX>,
                     0);
 
   return the_lock;
@@ -98,11 +98,11 @@ TAO_Default_Server_Strategy_Factory::create_cached_connector_lock (void)
 
   if (this->cached_connector_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
+                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
                     0);
   else
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (),
+                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX>,
                     0);
 
   return the_lock;
@@ -110,7 +110,9 @@ TAO_Default_Server_Strategy_Factory::create_cached_connector_lock (void)
 
 // Evil macros b/c I'm lazy!
 #define TAO_BEGINCHECK  if (0)
-#define TAO_CHECKANDSET(sym) else if (ACE_OS::strcmp (flag, #sym) == 0) ACE_SET_BITS (this->thread_flags_, sym)
+#define TAO_CHECKANDSET(sym) \
+  else if (ACE_OS::strcmp (flag, #sym) == 0) \
+  ACE_SET_BITS (this->thread_flags_, sym)
 #define TAO_ENDCHECK
 
 void
@@ -118,9 +120,13 @@ TAO_Default_Server_Strategy_Factory::tokenize (char *flag_string)
 {
   char *lasts = 0;
 
-  for (char *flag = ACE_OS::strtok_r (flag_string, "|", &lasts);
+  for (char *flag = ACE_OS::strtok_r (flag_string,
+                                      "|",
+                                      &lasts);
        flag != 0;
-       flag = ACE_OS::strtok_r (0, "|", &lasts))
+       flag = ACE_OS::strtok_r (0,
+                                "|",
+                                &lasts))
     {
       TAO_BEGINCHECK;
       TAO_CHECKANDSET (THR_DETACHED);
@@ -141,7 +147,7 @@ TAO_Default_Server_Strategy_Factory::init (int argc, char *argv[])
 }
 
 int
-TAO_Default_Server_Strategy_Factory::open (TAO_ORB_Core* orb_core)
+TAO_Default_Server_Strategy_Factory::open (TAO_ORB_Core *orb_core)
 {
   return 0;
 }
@@ -154,180 +160,238 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
   int curarg;
 
   for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
-    if (ACE_OS::strcmp (argv[curarg], "-ORBconcurrency") == 0)
+    if (ACE_OS::strcasecmp (argv[curarg],
+                            "-ORBConcurrency") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "reactive") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "reactive") == 0)
               this->activate_server_connections_ = 0;
-            else if (ACE_OS::strcasecmp (name, "thread-per-connection") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "thread-per-connection") == 0)
               this->activate_server_connections_ = 1;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBtablesize") == 0 ||
-             ACE_OS::strcmp (argv[curarg], "-ORBactiveobjectmapsize") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBTableSize") == 0 
+             || ACE_OS::strcasecmp (argv[curarg],
+                                    "-ORBActiveObjectMapSize") == 0)
       {
         curarg++;
         if (curarg < argc)
-          this->active_object_map_creation_parameters_.active_object_map_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
+          this->active_object_map_creation_parameters_.active_object_map_size_ =
+            ACE_OS::strtoul (argv[curarg],
+                             0,
+                             10);
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoamapsize") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBPOAMapSize") == 0)
       {
         curarg++;
         if (curarg < argc)
-          this->active_object_map_creation_parameters_.poa_map_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
+          this->active_object_map_creation_parameters_.poa_map_size_ =
+            ACE_OS::strtoul (argv[curarg],
+                             0,
+                             10);
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBactivehintinids") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBActiveHintInIds") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *value = argv[curarg];
 
-            this->active_object_map_creation_parameters_.use_active_hint_in_ids_ = ACE_OS::atoi (value);
+            this->active_object_map_creation_parameters_.use_active_hint_in_ids_ =
+              ACE_OS::atoi (value);
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBactivehintinpoanames") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBActiveHintInPOANames") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *value = argv[curarg];
 
-            this->active_object_map_creation_parameters_.use_active_hint_in_poa_names_ = ACE_OS::atoi (value);
+            this->active_object_map_creation_parameters_.use_active_hint_in_poa_names_ =
+              ACE_OS::atoi (value);
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBallowreactivationofsystemids") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBAllowReactivationOfSystemids") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *value = argv[curarg];
 
-            this->active_object_map_creation_parameters_.allow_reactivation_of_system_ids_ = ACE_OS::atoi (value);
+            this->active_object_map_creation_parameters_.allow_reactivation_of_system_ids_ =
+              ACE_OS::atoi (value);
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBuseridpolicydemuxstrategy") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBUseridPolicyDemuxStrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            // Active demux not supported with user id policy
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ = TAO_LINEAR;
+            // Active demux not supported with user id policy.
+            if (ACE_OS::strcasecmp (name,
+                                    "dynamic") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
+                TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name,
+                                         "linear") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
+                TAO_LINEAR;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBsystemidpolicydemuxstrategy") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBSystemidPolicyDemuxStrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name, "active") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_ACTIVE_DEMUX;
+            if (ACE_OS::strcasecmp (name,
+                                    "dynamic") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
+                TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name,
+                                         "linear") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
+                TAO_LINEAR;
+            else if (ACE_OS::strcasecmp (name,
+                                         "active") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
+                TAO_ACTIVE_DEMUX;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpersistentidpolicydemuxstrategy") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBPersistentidPolicyDemuxStrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            // Active demux not supported with user id policy
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ = TAO_LINEAR;
+            // Active demux not supported with user id policy.
+            if (ACE_OS::strcasecmp (name,
+                                    "dynamic") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
+                TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name,
+                                         "linear") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
+                TAO_LINEAR;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBtransientidpolicydemuxstrategy") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBTransientidPolicyDemuxStrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name, "active") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_ACTIVE_DEMUX;
+            if (ACE_OS::strcasecmp (name,
+                                    "dynamic") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
+                TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name,
+                                         "linear") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
+                TAO_LINEAR;
+            else if (ACE_OS::strcasecmp (name,
+                                         "active") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
+                TAO_ACTIVE_DEMUX;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBuniqueidpolicyreversedemuxstrategy") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBUniqueidPolicyReverseDemuxStrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_LINEAR;
+            if (ACE_OS::strcasecmp (name,
+                                    "dynamic") == 0)
+              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
+                TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name,
+                                         "linear") == 0)
+              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
+                TAO_LINEAR;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBdemuxstrategy") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBDemuxStrategy") == 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "Warning: -ORBdemuxstrategy is deprecated.  Please use "
-                    "-ORBsystemidpolicydemuxstrategy or -ORBuseridpolicydemuxstrategy instead.\n"));
+                    "Warning: -ORBDemuxStrategy is deprecated.  Please use "
+                    "-ORBSystemidPolicyDemuxStrategy or -ORBUseridPolicyDemuxStrategy instead.\n"));
         curarg++;
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoalock") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBPOALock") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "thread") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "thread") == 0)
               this->poa_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name, "null") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "null") == 0)
               this->poa_lock_type_ = TAO_NULL_LOCK;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBeventlock") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBEventLock") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "thread") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "thread") == 0)
               this->poa_mgr_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name, "null") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "null") == 0)
               this->poa_mgr_lock_type_ = TAO_NULL_LOCK;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBconnectorlock") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBConnectorLock") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "thread") == 0)
+            if (ACE_OS::strcasecmp (name,
+                                    "thread") == 0)
               this->cached_connector_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name, "null") == 0)
+            else if (ACE_OS::strcasecmp (name,
+                                         "null") == 0)
               this->cached_connector_lock_type_ = TAO_NULL_LOCK;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBthreadflags") == 0)
+    else if (ACE_OS::strcasecmp (argv[curarg],
+                                 "-ORBThreadFlags") == 0)
       {
         curarg++;
 
diff --git a/TAO/tests/FL_Cube/svc.conf b/TAO/tests/FL_Cube/svc.conf
index 192ca875c45..37133810cc8 100644
--- a/TAO/tests/FL_Cube/svc.conf
+++ b/TAO/tests/FL_Cube/svc.conf
@@ -1,3 +1,3 @@
 # $Id$
 #
-static Resource_Factory "-ORBreactortype fl_reactor"
+static Resource_Factory "-ORBReactorType fl_reactor"
diff --git a/TAO/tests/NestedUpcall/Reactor/svc.conf b/TAO/tests/NestedUpcall/Reactor/svc.conf
index 61618bf5694..40e55e3e868 100644
--- a/TAO/tests/NestedUpcall/Reactor/svc.conf
+++ b/TAO/tests/NestedUpcall/Reactor/svc.conf
@@ -3,4 +3,4 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Client_Strategy_Factory "-ORBclientconnectionhandler ST"
+static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
diff --git a/TAO/tests/Param_Test/svc.conf b/TAO/tests/Param_Test/svc.conf
index 599839eb910..7cc77c18f5e 100644
--- a/TAO/tests/Param_Test/svc.conf
+++ b/TAO/tests/Param_Test/svc.conf
@@ -2,6 +2,6 @@
 #
 # Please read $TAO_ROOT/docs/Options.html for details.
 #
-static Resource_Factory "-ORBresources global"
+static Resource_Factory "-ORBResources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBConcurrency reactive -ORBTableSize 128"