Updated README's

4 files changed, 31 insertions, 81 deletions

diff --git a/TAO/orbsvcs/tests/Miop/McastHello/README b/TAO/orbsvcs/tests/Miop/McastHello/README
index b9b1c26edfb..d96228dc866 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/README
+++ b/TAO/orbsvcs/tests/Miop/McastHello/README
@@ -1,28 +1,15 @@
 /**
 
-@page Hello Test README File
+@page McastHello Test README File
 
-	The simplest possible test for TAO.  This is a very simple
-test for TAO, it can be argued that it is in fact too simple to do
-anything useful, i.e. chances are that this test will always pass.
+This test verifies basic functionality of the MIOP support in TAO.
+It creates two servers that listen on the same group id for requests.
+A client then sends a few requests using MIOP.  If both servers
+receive the multicast requests as expected, the test is successful.
+The most likely failure of the test is if the servers don't receive
+the requests and subsequently time out.
 
-	The goals of writing this test are:
-
-- Provide a very simple, very fast 'smoke test' for ORB developers.
-  If Hello does not pass then something is extremely broken and you
-  should go back to the drawing board.
-- Provide a code base to write more complex tests
-- Rule out basic infrastructure problems: if this test does not work
-  for a user then the infrastructure (network, DNS, host
-  configuration) are more likely to be at fault than the ORB.
-- External users are often asked to send us a 'simple test' for their
-  use case, we can now point them to this test to explain what do we
-  mean by "simple".
-
-	Please refrain from "improving", extending or expanding this
-test, if you need to change 
-
-	To run the test use the run_test.pl script:
+	To run the test, use the run_test.pl script:
 
 $ ./run_test.pl
 
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.dsp b/TAO/orbsvcs/tests/Miop/McastHello/client.dsp
index c109b51ca14..ad2afa1d59f 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.dsp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /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"

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # 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 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

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

 

 !ELSEIF  "$(CFG)" == "McastHello Client - Win32 Debug"

 

@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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 "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

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

 # SUBTRACT CPP /YX

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

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

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # 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 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

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

 

 !ENDIF 

 

@@ -110,13 +110,13 @@ SOURCE=.\Test.idl
 !IF  "$(CFG)" == "McastHello Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Test.idl

 InputName=Test

 

 BuildCmds= \

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

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

 

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

    $(BuildCmds)

@@ -148,13 +148,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "McastHello Client - Win32 Debug"

 

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Test.idl

 InputName=Test

 

 BuildCmds= \

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

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

 

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

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.dsp b/TAO/orbsvcs/tests/Miop/McastHello/server.dsp
index 4b5cf8885c2..eeaea63e453 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.dsp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /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"

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # 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_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

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

 

 !ELSEIF  "$(CFG)" == "McastHello Server - Win32 Debug"

 

@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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 "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

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

 # SUBTRACT CPP /YX

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

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

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # 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_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

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

 

 !ENDIF 

 

@@ -122,13 +122,13 @@ SOURCE=.\Test.idl
 !IF  "$(CFG)" == "McastHello Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Test.idl

 InputName=Test

 

 BuildCmds= \

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

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

 

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

    $(BuildCmds)

@@ -160,13 +160,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "McastHello Server - Win32 Debug"

 

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Test.idl

 InputName=Test

 

 BuildCmds= \

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

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

 

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

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/Miop/README b/TAO/orbsvcs/tests/Miop/README
index 1279b901967..a18f066d6b1 100644
--- a/TAO/orbsvcs/tests/Miop/README
+++ b/TAO/orbsvcs/tests/Miop/README
@@ -1,50 +1,13 @@
 $Id$
 
-This is a unit test for RTCORBA::CLIENT_PROPAGATED priority model.
+This directory houses a collection of tests that exercise TAO support
+for features defined in the MIOP specification. 
 
-Scenario:
---------
+Each individual subdirectory contains a README file with more
+information on the corresponding test.  The list of tests so far
+includes the following:
 
-Server creates a POA with RTCORBA::CLIENT_PROPAGATED priority model
-policy and registers a servant with it.  Client obtains the object
-reference and verifies that it does have the RTCORBA::CLIENT_PROPAGATED
-priority model set.  Client then performs several invocations on the
-object, changing the priority of its thread before each.  The client
-also passes its thread priority as an argument to each operation.
-For each invocation, the servant checks that it's thread priority is
-equivalent to the priority of the invoking client thread, which we know
-from the operation argument.  In addition, the server verifies that
-it's starting thread priority (before entering ORB event loop) is the
-same as it's ending thread priority (ater ORB shutdown), to insure
-that the thread servicing the requests at client propagated priority
-is always returned to its original priority.
+        . McastHello
 
-To run (on Unix):
--------
-$./server
-$./client
+          Tests basic MIOP functionality.
 
-Options:
---------
-server [-o ior_output_file]
-client [-k server_ior]
-
-Expected output:
-----------------
-Client executable produces no output (unless there are errors).
-Server should produces the following if there are no errors (the
-priority numbers may differ from platform to platform):
-
-$server
-Activated as <IOR:010000000d00000049444c3a546573743a312e300000000001000000000000
-00a6000000010102cd15000000636f727269646f2e63732e777573746c2e65647500cde304230000
-0014010f004e5354c5c9a539bd0105000100000001000000000000000100000001000000cd040000
-00000000000800000001cdcdcd004f4154010000001400000001cdcdcd0100010000000000090101
-0000000000004f41540400000001cd0000020000001a00000001cdcdcd01000000020041540a0000
-0001cdcdcd000000000000>
-
-Client priority: 0  Servant thread priority: 0
-Client priority: 1  Servant thread priority: 1
-Client priority: 2  Servant thread priority: 2
-Server ORB event loop finished
-Final priority of the servant thread = its initial priority