ChangeLogTag:Mon Jun 19 20:35:46 2000 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 642 insertions, 103 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index bed7d0fe40a..6bc06557790 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,133 +1,140 @@
+Mon Jun 19 20:35:46 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.dsw:
+        * orbsvcs/tests/Interoperable_Naming/server.dsp:
+        * orbsvcs/tests/Interoperable_Naming/client.dsp:
+          Add the project files to the new Interoperable Naming test.
+
 Mon Jun 19 19:26:14 2000  Ossama Othman  <ossama@uci.edu>
 
-	* examples/Content_Server/Makefile:
-
-	  Fixed conditional so that the AMI examples are built when AMI is
-	  not explicitly disabled.
-
-	* examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
-	* examples/Content_Server/SMI_Iterator/Content_Iterator_i.h:
-	* examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp:
-	* examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h:
-	* examples/Content_Server/SMI_Iterator/client.cpp:
-	* examples/Content_Server/SMI_Iterator/server.cpp:
-	* examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
-	* examples/Content_Server/AMI_Iterator/Content_Iterator_i.h:
-	* examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp:
-	* examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp:
-	* examples/Content_Server/AMI_Iterator/Iterator_Handler.h:
-	* examples/Content_Server/AMI_Iterator/client.cpp:
-	* examples/Content_Server/AMI_Iterator/server.cpp:
-	* examples/Content_Server/AMI_Observer/Callback.cpp:
-	* examples/Content_Server/AMI_Observer/Callback.h:
-
-	  Updated to conform to ACE/TAO coding style guidelines.  Thanks
-	  to Doug for providing feedback.
+        * examples/Content_Server/Makefile:
+
+          Fixed conditional so that the AMI examples are built when AMI is
+          not explicitly disabled.
+
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.h:
+        * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h:
+        * examples/Content_Server/SMI_Iterator/client.cpp:
+        * examples/Content_Server/SMI_Iterator/server.cpp:
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.h:
+        * examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp:
+        * examples/Content_Server/AMI_Iterator/Iterator_Handler.h:
+        * examples/Content_Server/AMI_Iterator/client.cpp:
+        * examples/Content_Server/AMI_Iterator/server.cpp:
+        * examples/Content_Server/AMI_Observer/Callback.cpp:
+        * examples/Content_Server/AMI_Observer/Callback.h:
+
+          Updated to conform to ACE/TAO coding style guidelines.  Thanks
+          to Doug for providing feedback.
 
 Mon Jun 19 18:10:17 2000  Carlos O'Ryan  <coryan@uci.edu>
 
-	* orbsvcs/tests/Interoperable_Naming/Makefile:
-	  Generate dependencies.
+        * orbsvcs/tests/Interoperable_Naming/Makefile:
+          Generate dependencies.
 
         * orbsvcs/tests/Interoperable_Naming/client.cpp:
         * orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp:
-	  Updated to use the new ACE_RE_THROW macros.
+          Updated to use the new ACE_RE_THROW macros.
 
 Mon Jun 19 16:59:35 2000  Ossama Othman  <ossama@uci.edu>
 
-	* examples/Content_Server/AMI_Observer/Callback.cpp:
-	* examples/Content_Server/AMI_Observer/Callback.h:
-	* examples/Content_Server/AMI_Observer/Callback_Handler.cpp:
-	* examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp:
-	* examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h:
-	* examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp:
-	* examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h:
-	* examples/Content_Server/AMI_Observer/Push_Web_Server.idl:
-	* examples/Content_Server/AMI_Observer/client.cpp:
-	* examples/Content_Server/AMI_Observer/server.cpp:
+        * examples/Content_Server/AMI_Observer/Callback.cpp:
+        * examples/Content_Server/AMI_Observer/Callback.h:
+        * examples/Content_Server/AMI_Observer/Callback_Handler.cpp:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h:
+        * examples/Content_Server/AMI_Observer/Push_Web_Server.idl:
+        * examples/Content_Server/AMI_Observer/client.cpp:
+        * examples/Content_Server/AMI_Observer/server.cpp:
 
-	  Cleaned up trailing whitespace.
+          Cleaned up trailing whitespace.
 
-	* examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp:
-	* examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp:
+        * examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h:
 
-	  Added method to explicitly deactivate the client side AMI Reply
-	  Handler once the metadata has been received from the server.
-	  This fixes a bug where deactivation wasn't occuring.
+          Added method to explicitly deactivate the client side AMI Reply
+          Handler once the metadata has been received from the server.
+          This fixes a bug where deactivation wasn't occuring.
 
-	* examples/Content_Server/AMI_Observer/README:
+        * examples/Content_Server/AMI_Observer/README:
 
-	  Added instructions that explain how to run the example, and
-	  provided some sample output.
+          Added instructions that explain how to run the example, and
+          provided some sample output.
 
 Mon Jun 19 18:38:00 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* examples/Content_Server/AMI_Iterator: Made some minor formatting
-	  changes.
+        * examples/Content_Server/AMI_Iterator: Made some minor formatting
+          changes.
 
 Mon Jun 19 15:56:18 2000  Ossama Othman  <ossama@uci.edu>
 
-	* examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
-	* examples/Content_Server/AMI_Iterator/Content_Iterator_i.h:
-	* examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp:
-	* examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h:
-	* examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp:
-	* examples/Content_Server/AMI_Iterator/client.cpp:
-	* examples/Content_Server/AMI_Iterator/server.cpp:
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.h:
+        * examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h:
+        * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp:
+        * examples/Content_Server/AMI_Iterator/client.cpp:
+        * examples/Content_Server/AMI_Iterator/server.cpp:
 
-	  Cleaned up trailing whitespace.  Updated server code to match
-	  that in SMI_Iterator example.
+          Cleaned up trailing whitespace.  Updated server code to match
+          that in SMI_Iterator example.
 
-	* examples/Content_Server/AMI_Iterator/Web_Server.idl:
+        * examples/Content_Server/AMI_Iterator/Web_Server.idl:
 
-	  Cleaned up some trailing whitespace.
+          Cleaned up some trailing whitespace.
 
-	* examples/Content_Server/AMI_Iterator/README:
+        * examples/Content_Server/AMI_Iterator/README:
 
-	  Added instructions that explain how to run the example, and
-	  provided some sample output.
+          Added instructions that explain how to run the example, and
+          provided some sample output.
 
-	* examples/Content_Server/AMI_Iterator/Makefile:
+        * examples/Content_Server/AMI_Iterator/Makefile:
 
-	  Updated dependencies.
+          Updated dependencies.
 
 Mon Jun 19 15:36:38 2000  Ossama Othman  <ossama@uci.edu>
 
-	* examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
-	* examples/Content_Server/SMI_Iterator/Content_Iterator_i.h:
-	* examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp:
-	* examples/Content_Server/SMI_Iterator/client.cpp:
-	* examples/Content_Server/SMI_Iterator/server.cpp:
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.h:
+        * examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp:
+        * examples/Content_Server/SMI_Iterator/client.cpp:
+        * examples/Content_Server/SMI_Iterator/server.cpp:
 
-	  Updated to use ACE_FILE_Connector and ACE_Process_Manager to
-	  improve portability.
+          Updated to use ACE_FILE_Connector and ACE_Process_Manager to
+          improve portability.
 
-	* examples/Content_Server/SMI_Iterator/Web_Server.idl:
+        * examples/Content_Server/SMI_Iterator/Web_Server.idl:
 
-	  Cleaned up some trailing whitespace.
+          Cleaned up some trailing whitespace.
 
-	* examples/Content_Server/SMI_Iterator/client.dsp:
-	* examples/Content_Server/SMI_Iterator/server.dsp:
+        * examples/Content_Server/SMI_Iterator/client.dsp:
+        * examples/Content_Server/SMI_Iterator/server.dsp:
 
-	  Corrected tao_idl compiler location.
+          Corrected tao_idl compiler location.
 
-	* examples/Content_Server/SMI_Iterator/README:
+        * examples/Content_Server/SMI_Iterator/README:
 
-	  Added instructions that explain how to run the example, and
-	  provided some sample output.
+          Added instructions that explain how to run the example, and
+          provided some sample output.
 
-	* examples/Content_Server/SMI_Iterator/Makefile:
+        * examples/Content_Server/SMI_Iterator/Makefile:
 
-	  Updated dependencies.
+          Updated dependencies.
 
-	* examples/Makefile (DIRS):
+        * examples/Makefile (DIRS):
 
-	  Added Content_Server to list of directories to recurse into.
+          Added Content_Server to list of directories to recurse into.
 
-	* examples/Content_Server/Makefile:
+        * examples/Content_Server/Makefile:
 
-	  Added a top-level Content_Server example Makefile that descends
-	  into each of the Content_Server example directories.
+          Added a top-level Content_Server example Makefile that descends
+          into each of the Content_Server example directories.
 
 Mon Jun 19 14:22:07 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.dsw b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.dsw
new file mode 100644
index 00000000000..7ed23ec1333
--- /dev/null
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.dsw
@@ -0,0 +1,41 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "Interoperable Naming Client"=.\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Interoperable Naming Server"=.\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp b/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp
new file mode 100644
index 00000000000..8fc799e79fe
--- /dev/null
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp
@@ -0,0 +1,246 @@
+# Microsoft Developer Studio Project File - Name="Interoperable Naming Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Interoperable Naming Client - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "client.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "client.mak" CFG="Interoperable Naming Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Interoperable Naming Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Interoperable Naming Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Interoperable Naming Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+

+!ELSEIF  "$(CFG)" == "Interoperable Naming Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib TAOd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Interoperable Naming Client - Win32 Release"

+# Name "Interoperable Naming Client - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=.\client.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ncontextext_client_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=.\client.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ncontextext_client_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS_T.h

+# End Source File

+# End Group

+# Begin Group "IDL Files"

+

+# PROP Default_Filter ".idl"

+# Begin Source File

+

+SOURCE=.\Web_Server.idl

+

+!IF  "$(CFG)" == "Interoperable Naming Client - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__WEB_S="..\..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Web_Server.idl

+InputName=Web_Server

+

+BuildCmds= \

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Interoperable Naming Client - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__WEB_S="..\..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Web_Server.idl

+InputName=Web_Server

+

+BuildCmds= \

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ".i"

+# Begin Source File

+

+SOURCE=.\Web_ServerC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS_T.i

+# End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Web_ServerS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 19d3a457e57..fffdd3d433b 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -229,11 +229,6 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
             }
         }
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-      ACE_RE_THROW;
-    }
   ACE_CATCH (CORBA::NO_MEMORY, ex)
     {
       ACE_PRINT_EXCEPTION (ex, "A system exception oc client side");
@@ -244,7 +239,11 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
       ACE_PRINT_EXCEPTION (ex, "A system exception oc client side");
       return -1;
     }
-
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ACE_RE_THROW;
+    }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
@@ -312,10 +311,10 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
                                     CORBA::String_var url_string)
 {
 
-  ACE_OS::printf ( "The first component id is %s,
-                    The first component kind is %s,
-                    The second component id is %s,
-                    The second component kind is %s\n\n",
+  ACE_OS::printf ("The first component id is %s,\n"
+                  "The first component kind is %s,\n"
+                  "The second component id is %s,\n"
+                  "The second component kind is %s\n\n",
                    name[0].id.in (),
                    name[0].kind.in (),
                    name[1].id.in (),
@@ -324,19 +323,19 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
   ACE_OS::printf ("The string form of the input name is:\n %s\n",
                   str_name.in ());
 
-  ACE_OS::printf ("The unstringified version of the name components are:\n
-                   The first component id is %s,
-                   The first component kind is %s,
-                   The second component id is %s,
-                   The second component kind is %s\n",
+  ACE_OS::printf ("The unstringified version of the name components are:\n"
+                  "The first component id is %s,\n"
+                  "The first component kind is %s,\n"
+                  "The second component id is %s,\n"
+                  "The second component kind is %s\n\n",
                   nm[0].id.in (),
                   nm[0].kind.in (),
                   nm[1].id.in (),
                   nm[1].kind.in ());
 
-  ACE_OS::printf ("When the address of the NamingCOntext is:\t
-                   myhost.555xyz.com:9999
-                   and the Object name is %s\n",
+  ACE_OS::printf ("When the address of the NamingCOntext is:\t"
+                  "myhost.555xyz.com:9999"
+                  "and the Object name is %s\n",
                   obj_name.in ());
 
   ACE_OS::printf ("The URL form of the string is \n %s\n",
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/server.dsp b/TAO/orbsvcs/tests/Interoperable_Naming/server.dsp
new file mode 100644
index 00000000000..d019f908b61
--- /dev/null
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/server.dsp
@@ -0,0 +1,246 @@
+# Microsoft Developer Studio Project File - Name="Interoperable Naming Server" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Interoperable Naming Server - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "server.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "server.mak" CFG="Interoperable Naming Server - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Interoperable Naming Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Interoperable Naming Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Interoperable Naming Server - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+

+!ELSEIF  "$(CFG)" == "Interoperable Naming Server - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib TAOd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Interoperable Naming Server - Win32 Release"

+# Name "Interoperable Naming Server - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=.\Iterator_Factory_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\server.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=.\Iterator_Factory_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\server.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS_T.h

+# End Source File

+# End Group

+# Begin Group "IDL Files"

+

+# PROP Default_Filter ".idl"

+# Begin Source File

+

+SOURCE=.\Web_Server.idl

+

+!IF  "$(CFG)" == "Interoperable Naming Server - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__WEB_S="..\..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Web_Server.idl

+InputName=Web_Server

+

+BuildCmds= \

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Interoperable Naming Server - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__WEB_S="..\..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Web_Server.idl

+InputName=Web_Server

+

+BuildCmds= \

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ".i"

+# Begin Source File

+

+SOURCE=.\Web_ServerC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Web_ServerS_T.i

+# End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Web_ServerS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# End Target

+# End Project