ChangeLogTag:Wed Feb 27 03:59:35 2002 Carlos O'Ryan <coryan@uci.edu>

11 files changed, 604 insertions, 143 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 36b48680011..d390a2ea80f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,23 @@
+Wed Feb 27 03:59:35 2002  Carlos O'Ryan  <coryan@uci.edu>
+
+	* TAOACE.dsw:
+	* TAOACE_Static.dsw:
+	* tao/TAO.dsw:
+	* tao/Messaging/TAO_Messaging.dsp:
+	* tao/Messaging/TAO_Messaging_Static.dsp:
+	  Add new project files for the TAO_Messaging library.
+	  Add the projects to the workspaces and fixed dependencies.
+
+	* tao/TAO.dsp:
+	* tao/TAO_Static.dsp:
+	* tao/PortableServer/TAO_PortableServer.dsp:
+	* tao/PortableServer/TAO_PortableServer_Static.dsp:
+	  Remove files that are now on the TAO_Messaging library, add new
+	  files.
+
+	* tao/Messaging/Messaging.h:
+	  Fixed TAO_Export macros.
+
 Wed Feb 27 10:39:12 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Messaging/Asynch_Timeout_Handler.h:
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 57d44db8b0a..82f1ffd7e68 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -624,6 +624,18 @@ Package=<4>
 

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

 

+Project: "Messaging"=.\tao\Messaging\TAO_Messaging.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "NT_Naming_Service"=.\orbsvcs\Naming_Service\NT_Naming_Service.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw
index a19365f7e79..72338e96de2 100644
--- a/TAO/TAOACE_Static.dsw
+++ b/TAO/TAOACE_Static.dsw
@@ -342,6 +342,18 @@ Package=<4>
 

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

 

+Project: "Messaging_Static"=.\tao\Messaging\TAO_Messaging_Static.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "Naming Service Static"=.\orbsvcs\Naming_Service\Naming_Server_static.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index 9aa5169a8f9..9d82c63d07e 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -82,13 +82,14 @@ namespace TAO_Messaging_Helper
 {
   /// Implement the code shared by all the ExceptionHolder::raise_*()
   /// operations
-  void TAO_Export exception_holder_raise (TAO_Exception_Data *exception_data,
-                                          CORBA::ULong exception_count,
-                                          CORBA::Octet *marshaled_data,
-                                          CORBA::ULong marshaled_data_length,
-                                          CORBA::Boolean byte_order,
-                                          CORBA::Boolean is_system_exception
-                                          ACE_ENV_ARG_DECL);
+  void TAO_Messaging_Export exception_holder_raise (
+           TAO_Exception_Data *exception_data,
+           CORBA::ULong exception_count,
+           CORBA::Octet *marshaled_data,
+           CORBA::ULong marshaled_data_length,
+           CORBA::Boolean byte_order,
+           CORBA::Boolean is_system_exception
+           ACE_ENV_ARG_DECL);
 }
 
 #endif /* TAO_HAS_AMI_CALLBACK */
diff --git a/TAO/tao/Messaging/TAO_Messaging.dsp b/TAO/tao/Messaging/TAO_Messaging.dsp
new file mode 100644
index 00000000000..debad0fd7e5
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_Messaging.dsp
@@ -0,0 +1,288 @@
+# Microsoft Developer Studio Project File - Name="Messaging" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=Messaging - Win32 MFC 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 "TAO_Messaging.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 "TAO_Messaging.mak" CFG="Messaging - Win32 MFC Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Messaging - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Messaging - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Messaging - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Messaging - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Messaging - 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 "DLL\Release\Messaging"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Messaging_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

+# ADD RSC /l 0x409 /i ".." /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 /dll /machine:I386

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_Messaging.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Messaging - 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 "DLL\Debug\Messaging"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

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

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

+# ADD RSC /l 0x409 /i ".." /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 /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Messaging - Win32 MFC Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Messaging___Win32_MFC_Debug"

+# PROP BASE Intermediate_Dir "Messaging___Win32_MFC_Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Debug\MessagingMFC"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_PortableServermfcd.lib TAOmfcd.lib acemfcd.lib 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 /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Messaging - Win32 MFC Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Messaging___Win32_MFC_Release"

+# PROP BASE Intermediate_Dir "Messaging___Win32_MFC_Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Release\MessagingMFC"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib TAO.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Messaging.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_PortableServermfc.lib TAOmfc.lib acemfc.lib 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 /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Messaging - Win32 Release"

+# Name "Messaging - Win32 Debug"

+# Name "Messaging - Win32 MFC Debug"

+# Name "Messaging - Win32 MFC Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\Asynch_Reply_Dispatcher.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Asynch_Timeout_Handler.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_ORBInitializer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_Policy_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_PolicyFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Twoway_Asynch_Invocation.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Asynch_Reply_Dispatcher.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Asynch_Timeout_Handler.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\messaging_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_ORBInitializer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_Policy_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_PolicyFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Twoway_Asynch_Invocation.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ".i"

+# Begin Source File

+

+SOURCE=.\Asynch_Reply_Dispatcher.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_Policy_i.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Twoway_Asynch_Invocation.i

+# End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\MessagingS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "rc"

+# Begin Source File

+

+SOURCE=.\TAO_Messaging.rc

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/Messaging/TAO_Messaging_Static.dsp b/TAO/tao/Messaging/TAO_Messaging_Static.dsp
new file mode 100644
index 00000000000..19b944387f9
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_Messaging_Static.dsp
@@ -0,0 +1,215 @@
+# Microsoft Developer Studio Project File - Name="Messaging_Static" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=Messaging_Static - Win32 Static 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 "TAO_Messaging_Static.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 "TAO_Messaging_Static.mak" CFG="Messaging_Static - Win32 Static Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Messaging_Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "Messaging_Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Messaging_Static - Win32 Static 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 "LIB\Release\Messaging"

+# PROP Target_Dir ""

+LINK32=link.exe -lib

+MTL=midl.exe

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

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "_WINDOWS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32" /D "TAO_AS_STATIC_LIBS" /D "ACE_AS_STATIC_LIBS" /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

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"TAO_Messagings.lib"

+

+!ELSEIF  "$(CFG)" == "Messaging_Static - Win32 Static 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 "LIB\Debug\Messaging"

+# PROP Target_Dir ""

+LINK32=link.exe -lib

+MTL=midl.exe

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

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /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

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"TAO_Messagingsd.lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Messaging_Static - Win32 Static Release"

+# Name "Messaging_Static - Win32 Static Debug"

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\MessagingS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i,inl"

+# Begin Source File

+

+SOURCE=.\Asynch_Reply_Dispatcher.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_Policy_i.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Twoway_Asynch_Invocation.i

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h"

+# Begin Source File

+

+SOURCE=.\Asynch_Reply_Dispatcher.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Asynch_Timeout_Handler.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\messaging_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_ORBInitializer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_Policy_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_PolicyFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Twoway_Asynch_Invocation.h

+# End Source File

+# End Group

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp"

+# Begin Source File

+

+SOURCE=.\Asynch_Reply_Dispatcher.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Asynch_Timeout_Handler.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_ORBInitializer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_Policy_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Messaging_PolicyFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Twoway_Asynch_Invocation.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp
index 504af549afd..4ddd9d3f2ec 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp
@@ -208,10 +208,6 @@ SOURCE=.\Key_Adapters.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_Adapter.cpp

 # End Source File

 # Begin Source File

@@ -352,14 +348,6 @@ SOURCE=.\Key_Adapters.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_Adapter.h

 # End Source File

 # Begin Source File

@@ -480,14 +468,6 @@ SOURCE=.\Key_Adapters.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_Adapter.i

 # End Source File

 # Begin Source File

@@ -535,11 +515,6 @@ SOURCE=.\ServerRequestInfo.inl
 SOURCE=.\ImplRepoS_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
index 017c7c37dad..943de5abf28 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
@@ -94,11 +94,6 @@ LIB32=link.exe -lib
 SOURCE=.\ImplRepoS_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -133,14 +128,6 @@ SOURCE=.\Key_Adapters.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_Adapter.i

 # End Source File

 # Begin Source File

@@ -229,14 +216,6 @@ SOURCE=.\Key_Adapters.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_Adapter.h

 # End Source File

 # Begin Source File

@@ -377,10 +356,6 @@ SOURCE=.\Key_Adapters.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_Adapter.cpp

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index d2335b29bf5..ecf9974d1e8 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -191,11 +191,7 @@ SOURCE=.\Asynch_Queued_Message.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Timeout_Handler.cpp

+SOURCE=.\Asynch_Reply_Dispatcher_Base.cpp

 # End Source File

 # Begin Source File

 

@@ -575,23 +571,11 @@ SOURCE=.\MCAST_Parser.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_ORBInitializer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_PolicyFactory.cpp

+SOURCE=.\Messaging_PolicyValueC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.cpp

+SOURCE=.\Messaging_SyncScopeC.cpp

 # End Source File

 # Begin Source File

 

@@ -971,11 +955,7 @@ SOURCE=.\Asynch_Queued_Message.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Timeout_Handler.h

+SOURCE=.\Asynch_Reply_Dispatcher_Base.h

 # End Source File

 # Begin Source File

 

@@ -1375,23 +1355,11 @@ SOURCE=.\MCAST_Parser.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_ORBInitializer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_PolicyFactory.h

+SOURCE=.\Messaging_PolicyValueC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.h

+SOURCE=.\Messaging_SyncScopeC.h

 # End Source File

 # Begin Source File

 

@@ -1779,7 +1747,7 @@ SOURCE=.\Asynch_Invocation.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.i

+SOURCE=.\Asynch_Reply_Dispatcher_Base.i

 # End Source File

 # Begin Source File

 

@@ -2075,11 +2043,11 @@ SOURCE=.\MCAST_Parser.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_Policy_i.i

+SOURCE=.\Messaging_PolicyValueC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.i

+SOURCE=.\Messaging_SyncScopeC.i

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
index 1abde17fc38..5c655cfead9 100644
--- a/TAO/tao/TAO.dsw
+++ b/TAO/tao/TAO.dsw
@@ -48,7 +48,7 @@ Package=<4>
 

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

 

-Project: "Domain_static"=.\Domain\TAO_Domain_Static.dsp - Package Owner=<4>

+Project: "Domain_Static"=.\Domain\TAO_Domain_Static.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -56,9 +56,6 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name IFR_Client_Static

-    End Project Dependency

 }}}

 

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

@@ -210,6 +207,36 @@ Package=<4>
 

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

 

+Project: "Messaging"=.\Messaging\TAO_Messaging.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name PortableServer

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+}}}

+

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

+

+Project: "Messaging_Static"=.\Messaging\TAO_Messaging_Static.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "PortableServer"=.\PortableServer\TAO_PortableServer.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 2884022b790..085963bf9df 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -123,11 +123,7 @@ SOURCE=.\Asynch_Queued_Message.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Timeout_Handler.cpp

+SOURCE=.\Asynch_Reply_Dispatcher_Base.cpp

 # End Source File

 # Begin Source File

 

@@ -507,23 +503,11 @@ SOURCE=.\MCAST_Parser.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_ORBInitializer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_PolicyFactory.cpp

+SOURCE=.\Messaging_PolicyValueC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.cpp

+SOURCE=.\Messaging_SyncScopeC.cpp

 # End Source File

 # Begin Source File

 

@@ -903,11 +887,7 @@ SOURCE=.\Asynch_Queued_Message.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_Timeout_Handler.h

+SOURCE=.\Asynch_Reply_Dispatcher_Base.h

 # End Source File

 # Begin Source File

 

@@ -1351,23 +1331,11 @@ SOURCE=.\MCAST_Parser.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_ORBInitializer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_Policy_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Messaging_PolicyFactory.h

+SOURCE=.\Messaging_PolicyValueC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.h

+SOURCE=.\Messaging_SyncScopeC.h

 # End Source File

 # Begin Source File

 

@@ -1767,7 +1735,7 @@ SOURCE=.\Asynch_Invocation.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Reply_Dispatcher.i

+SOURCE=.\Asynch_Reply_Dispatcher_Base.i

 # End Source File

 # Begin Source File

 

@@ -2023,11 +1991,11 @@ SOURCE=.\MCAST_Parser.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Messaging_Policy_i.i

+SOURCE=.\Messaging_PolicyValueC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.i

+SOURCE=.\Messaging_SyncScopeC.i

 # End Source File

 # Begin Source File