ChangeLogTag: Wed Apr 09 14:54:03 2003 Pradeep Gore <pradeep@oomworks.com>

8 files changed, 194 insertions, 1 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f5555cbff05..59a69323323 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Apr 09 14:54:03 2003  Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/tests/Notify/Destroy/main.cpp:
+	  Invokes the NotifyExt::EventChannelFactory::destroy method.
+	
+	* orbsvcs/tests/Notify/Destroy/Destroy.mpc:
+	* orbsvcs/tests/Notify/Destroy/Makefile:
+	* orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp:
+	  Makefiles.
+	
+	* orbsvcs/tests/Notify/Makefile:
+	* orbsvcs/tests/Notify/Notify_Tests.dsw:
+	  Added the <Destroy> test.
+
+	* orbsvcs/tests/Notify/lib/Makefile.bor:
+	  Move the Activation_ManagerC to the top of the Makefile to fix
+	  compile errors. Thanks to Johnny Willemsen
+	  <jwillemsen@remedy.nl> for this suggestion.
+	 
+	
 Wed Apr  9 13:47:26 2003  Stuart Jones  <jones_s@ociweb.com>
 
 	* tao/Messaging/Messaging.cpp
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
new file mode 100644
index 00000000000..2f4788cdadd
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
@@ -0,0 +1,12 @@
+project (Notify_Test_Destroy): notifytest {
+  exename  = Notify_Tests_Destroy
+
+  libpaths += $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL
+  libpaths += $(TAO_ROOT)/tao/IORTable
+  libpaths += $(TAO_ROOT)/tao/DynamicAny
+  libpaths += $(TAO_ROOT)/tao/PortableServer
+
+  Source_Files {
+  main.cpp     
+  }
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Makefile b/TAO/orbsvcs/tests/Notify/Destroy/Makefile
new file mode 100644
index 00000000000..fe5c991cc80
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile
@@ -0,0 +1,39 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+DIRS  =	lib \
+	Basic \
+	performance-tests/RedGreen \
+	performance-tests/Filter \
+        Blocking \
+        Discarding \
+        MT_Dispatching \
+        Ordering \
+        Structured_Filter \
+        Structured_Multi_Filter \
+        Sequence_Multi_Filter \
+        Sequence_Multi_ETCL_Filter \
+	RT_lib \
+	Test_Filter
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp b/TAO/orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp
new file mode 100644
index 00000000000..f894016256e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp
@@ -0,0 +1,77 @@
+# Microsoft Developer Studio Project File - Name="Notify_Test_Destroy EXE" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

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

+

+CFG=Notify_Test_Destroy EXE - Win32 Debug

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

+!MESSAGE run the tool that generated this project file and specify the

+!MESSAGE nmake output type.  You can then use the following command:

+!MESSAGE

+!MESSAGE NMAKE /f "Notify_Test_Destroy.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 "Notify_Test_Destroy.mak" CFG="Notify_Test_Destroy EXE - Win32 Debug"

+!MESSAGE

+!MESSAGE Possible choices for configuration are:

+!MESSAGE

+!MESSAGE "Notify_Test_Destroy EXE - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Notify_Test_Destroy EXE - 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)" == "Notify_Test_Destroy EXE - Win32 Release"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD CPP /nologo /W3 /GX /O2 /MD /GR /I "..\..\..\..\orbsvcs\tests\Notify\lib" /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

+# SUBTRACT CPP /YX

+# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\..\..\orbsvcs\tests\Notify\lib" /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+BSC32=bscmake.exe

+# ADD BSC32 /nologo 

+LINK32=link.exe

+# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_NotifyTests.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\tests\Notify\lib" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:console  /machine:I386 /out:"Notify_Tests_Destroy.exe"

+

+!ELSEIF  "$(CFG)" == "Notify_Test_Destroy EXE - Win32 Debug"

+

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Target_Dir ""

+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\..\..\orbsvcs\tests\Notify\lib" /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

+# SUBTRACT CPP /YX

+# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\..\..\orbsvcs\tests\Notify\lib" /i "..\..\..\..\orbsvcs" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.."

+BSC32=bscmake.exe

+# ADD BSC32 /nologo 

+LINK32=link.exe

+# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_NotifyTestsd.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\tests\Notify\lib" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /nologo /version:1.3 /subsystem:console /debug /machine:I386 /out:"Notify_Tests_Destroy.exe"

+

+!ENDIF

+

+# Begin Target

+

+# Name "Notify_Test_Destroy EXE - Win32 Release"

+# Name "Notify_Test_Destroy EXE - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;cxx;c"

+# Begin Source File

+

+SOURCE=.\main.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
new file mode 100644
index 00000000000..64fda644f47
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -0,0 +1,32 @@
+//$Id$
+
+#include "../lib/Notify_Test_Client.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
+
+int
+ACE_TMAIN (int argc, char *argv[])
+{
+  ACE_TRY_NEW_ENV
+    {
+      // Initialize the base class.
+      Notify_Test_Client client;
+      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+      
+      CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory ();
+      
+      NotifyExt::EventChannelFactory_var ecf_ext = NotifyExt::EventChannelFactory::_narrow (ecf);
+      
+      ecf_ext->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           ACE_LIB_TEXT("Failed to run the program\n"));
+      return 1;
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/Notify/Makefile b/TAO/orbsvcs/tests/Notify/Makefile
index cf5ad9e0d76..92d6d5ae32a 100644
--- a/TAO/orbsvcs/tests/Notify/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Makefile
@@ -23,6 +23,7 @@ DIRS  =	lib \
 	RT_lib \
 	Test_Filter \
 	Driver \
+	Destroy \
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
index ed71d210ca1..805c776767b 100644
--- a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
+++ b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
@@ -357,6 +357,18 @@ Package=<4>
 

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

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "Ordering Sequence Consumer"=.\Ordering\Sequence_Consumer.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor b/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
index 66a74b9d88f..927ecac025f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
@@ -7,9 +7,9 @@ NAME = TAO_NotifyTests
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
 
 OBJFILES = \
-	$(OBJDIR)\Activation_Manager.obj \
 	$(OBJDIR)\Activation_ManagerC.obj \
 	$(OBJDIR)\Activation_ManagerS.obj \
+	$(OBJDIR)\Activation_Manager.obj \
 	$(OBJDIR)\Application_Command.obj \
 	$(OBJDIR)\Command.obj \
 	$(OBJDIR)\Command_Builder.obj \