ChangeLogTag: Wed Mar 19 08:42:45 2003 Pradeep Gore <pradeep@oomworks.com>

10 files changed, 78 insertions, 72 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
index 2f9890ee92d..ad483a8cd55 100755
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -29,7 +29,7 @@ $Supplier = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
 
 $Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
 
-$Consumer = new PerlACE::Process ("../Driver/Driver");
+$Consumer = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
 
 $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
 
diff --git a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
index 4a305d80b4b..3f4357110ac 100644
--- a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
+++ b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
@@ -216,6 +216,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Driver EXE"=.\Driver\Driver.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "Filter Structured Consumer"=.\Structured_Filter\Structured_Filter_Consumer.dsp - Package Owner=<4>

 

 Package=<5>

@@ -468,6 +480,30 @@ Package=<4>
 

 ###############################################################################

 

+Project: "TAO_RT_NotifyTests DLL"=.\lib\TAO_RT_NotifyTests.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

+Project: "TAO_RT_NotifyTests_Filter DLL"=.\lib\TAO_RT_NotifyTests_Filter.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Global:

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
index 2f9890ee92d..ad483a8cd55 100755
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
@@ -29,7 +29,7 @@ $Supplier = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
 
 $Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
 
-$Consumer = new PerlACE::Process ("../Driver/Driver");
+$Consumer = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
 
 $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index 420a0aee1ba..dcf24bc7691 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,8 +1,8 @@
 project(TAO_NotifyTests): orbsvcslib, notify {
-  depends += CosNotification
+  depends += CosNotification CosEvent
   sharedname += TAO_NotifyTests
 
-  libs += TAO_CosNotification
+  libs += TAO_CosNotification TAO_CosEvent
 
   libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL
   libpaths += $(TAO_ROOT)/tao/IORTable
diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
index 130ff3591d5..d3b4c2ebba4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 BSC32=bscmake.exe

 # ADD BSC32 /nologo /o".\TAO_NotifyTests.bsc"

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_CosNotification.lib TAO_ETCL.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib TAO_DynamicAny.lib TAO_PortableServer.lib TAO.lib ACE.lib /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:windows /dll  /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTests.dll"

+# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_CosEvent.lib TAO_CosNotification.lib TAO_ETCL.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib TAO_DynamicAny.lib TAO_PortableServer.lib TAO.lib ACE.lib /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:windows /dll  /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTests.dll"

 

 !ELSEIF  "$(CFG)" == "TAO_NotifyTests DLL - Win32 Debug"

 

@@ -59,7 +59,7 @@ LINK32=link.exe
 BSC32=bscmake.exe

 # ADD BSC32 /nologo /o".\TAO_NotifyTests.bsc"

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_CosNotificationd.lib TAO_ETCLd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib TAO_DynamicAnyd.lib TAO_PortableServerd.lib TAOd.lib ACEd.lib /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:windows /dll /debug /pdb:TAO_NotifyTestsd.pdb /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTestsd.dll"

+# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_CosEventd.lib TAO_CosNotificationd.lib TAO_ETCLd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib TAO_DynamicAnyd.lib TAO_PortableServerd.lib TAOd.lib ACEd.lib /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\IORTable" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:windows /dll /debug /pdb:TAO_NotifyTestsd.pdb /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTestsd.dll"

 

 !ENDIF

 

@@ -212,10 +212,6 @@ SOURCE=.\Activation_ManagerS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Application_Command.h

 # End Source File

 # Begin Source File

@@ -340,10 +336,6 @@ SOURCE=.\Activation_ManagerS.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Task_Stats.inl

 # End Source File

 # End Group

@@ -352,11 +344,6 @@ SOURCE=.\Task_Stats.inl
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

 SOURCE=.\Command_Factory_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests_Static.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests_Static.dsp
index 1c41b20b080..f5ea16a176f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests_Static.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests_Static.dsp
@@ -212,10 +212,6 @@ SOURCE=.\Activation_ManagerS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Application_Command.h

 # End Source File

 # Begin Source File

@@ -340,10 +336,6 @@ SOURCE=.\Activation_ManagerS.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Task_Stats.inl

 # End Source File

 # End Group

@@ -352,11 +344,6 @@ SOURCE=.\Task_Stats.inl
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

 SOURCE=.\Command_Factory_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests.dsp
index d63991b215c..dd99eb6338f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests.dsp
@@ -92,10 +92,6 @@ SOURCE=.\RT_Priority_Mapping.cpp
 # PROP Default_Filter "h;hpp;hxx;hh"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Command_Factory_T.h

 # End Source File

 # Begin Source File

@@ -116,17 +112,20 @@ SOURCE=.\RT_Priority_Mapping.h
 # PROP Default_Filter "i;inl"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.i

+SOURCE=.\Activation_ManagerC.i

 # End Source File

-# End Group

-# Begin Group "Template Files"

+# Begin Source File

 

-# PROP Default_Filter ""

+SOURCE=.\Activation_ManagerS.i

+# End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\Task_Stats.inl

 # End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Command_Factory_T.cpp

diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter.dsp
index 60ee460cabc..45b8a77f786 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter.dsp
@@ -84,10 +84,6 @@ SOURCE=.\RT_Test_FilterFactory.cpp
 # PROP Default_Filter "h;hpp;hxx;hh"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Command_Factory_T.h

 # End Source File

 # Begin Source File

@@ -104,17 +100,20 @@ SOURCE=.\RT_Test_FilterFactory.h
 # PROP Default_Filter "i;inl"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.i

+SOURCE=.\Activation_ManagerC.i

 # End Source File

-# End Group

-# Begin Group "Template Files"

+# Begin Source File

 

-# PROP Default_Filter ""

+SOURCE=.\Activation_ManagerS.i

+# End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\Task_Stats.inl

 # End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Command_Factory_T.cpp

diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter_Static.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter_Static.dsp
index ca787b42c86..3049983581a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter_Static.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Filter_Static.dsp
@@ -84,10 +84,6 @@ SOURCE=.\RT_Test_FilterFactory.cpp
 # PROP Default_Filter "h;hpp;hxx;hh"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Command_Factory_T.h

 # End Source File

 # Begin Source File

@@ -104,17 +100,20 @@ SOURCE=.\RT_Test_FilterFactory.h
 # PROP Default_Filter "i;inl"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.i

+SOURCE=.\Activation_ManagerC.i

 # End Source File

-# End Group

-# Begin Group "Template Files"

+# Begin Source File

 

-# PROP Default_Filter ""

+SOURCE=.\Activation_ManagerS.i

+# End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\Task_Stats.inl

 # End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Command_Factory_T.cpp

diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Static.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Static.dsp
index b99dc954cee..abaf11877dc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Static.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_RT_NotifyTests_Static.dsp
@@ -92,10 +92,6 @@ SOURCE=.\RT_Priority_Mapping.cpp
 # PROP Default_Filter "h;hpp;hxx;hh"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Command_Factory_T.h

 # End Source File

 # Begin Source File

@@ -116,17 +112,20 @@ SOURCE=.\RT_Priority_Mapping.h
 # PROP Default_Filter "i;inl"

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.i

+SOURCE=.\Activation_ManagerC.i

 # End Source File

-# End Group

-# Begin Group "Template Files"

+# Begin Source File

 

-# PROP Default_Filter ""

+SOURCE=.\Activation_ManagerS.i

+# End Source File

 # Begin Source File

 

-SOURCE=.\Activation_ManagerS_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\Task_Stats.inl

 # End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Command_Factory_T.cpp