From 166ef85e553b7b826186c41eaf772b96cfdc51a2 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Tue, 13 Aug 2002 00:55:59 +0000 Subject: ChangeLogTag:Mon Aug 12 17:53:08 2002 Ossama Othman --- TAO/ChangeLog | 26 ++ TAO/TAOACE.dsw | 36 ++- TAO/TAOACE_Static.dsw | 18 -- TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp | 131 ++++++++ TAO/orbsvcs/orbsvcs/LoadBalancing.dsp | 386 ----------------------- TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h | 4 +- TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp | 291 ----------------- 7 files changed, 193 insertions(+), 699 deletions(-) delete mode 100644 TAO/orbsvcs/orbsvcs/LoadBalancing.dsp delete mode 100644 TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5d3dc859994..a88775c86fa 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,29 @@ +Mon Aug 12 17:53:08 2002 Ossama Othman + + * TAOACE.dsw: + + Added new LoadManager and LoadMonitor projects to this + workspace. + + * TAOACE_Static.dsw: + + Removed old LoadBalancer project from this workspace. + + * orbsvcs/orbsvcs/LoadBalancing/LB_Component.h: + + Include "LoadBalancing_export.h" to pull Windows librar export + macros. + + * orbsvcs/orbsvcs/CosLoadBalancing.dsp: + + Added new sources to this project file. + + * orbsvcs/orbsvcs/LoadBalancing.dsp: + * orbsvcs/orbsvcs/LoadBalancing_Static.dsp: + + Removed these project files. They were used for the old load + balancer prototype. + Mon Aug 12 17:27:30 2002 Ossama Othman * orbsvcs/LoadBalancer/LoadBalancer_Service.dsp: diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw index 5d13b23f3db..7a33a810ea4 100644 --- a/TAO/TAOACE.dsw +++ b/TAO/TAOACE.dsw @@ -192,6 +192,24 @@ Package=<4> ############################################################################### +Project: "CosLoadBalancing"=.\orbsvcs\orbsvcs\CosLoadBalancing.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name PortableGroup + End Project Dependency + Begin Project Dependency + Project_Dep_Name Messaging + End Project Dependency +}}} + +############################################################################### + Project: "CosNaming"=.\orbsvcs\orbsvcs\CosNaming.dsp - Package Owner=<4> Package=<5> @@ -639,7 +657,7 @@ Package=<4> ############################################################################### -Project: "LoadBalancing"=.\orbsvcs\orbsvcs\LoadBalancing.dsp - Package Owner=<4> +Project: "LoadManager"=.\orbsvcs\LoadBalancer\LoadManager.dsp - Package Owner=<4> Package=<5> {{{ @@ -648,10 +666,22 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name TAO DLL + Project_Dep_Name CosLoadBalancing End Project Dependency +}}} + +############################################################################### + +Project: "LoadMonitor"=.\orbsvcs\LoadBalancer\LoadMonitor.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ Begin Project Dependency - Project_Dep_Name TAO_IDL Compiler + Project_Dep_Name CosLoadBalancing End Project Dependency }}} diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw index e69d7158ac5..e83fbb50436 100644 --- a/TAO/TAOACE_Static.dsw +++ b/TAO/TAOACE_Static.dsw @@ -321,24 +321,6 @@ Package=<4> ############################################################################### -Project: "LoadBalancing_Static"=.\orbsvcs\orbsvcs\LoadBalancing_Static.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name TAO_IDL Compiler Static - End Project Dependency - Begin Project Dependency - Project_Dep_Name PortableServer_Static - End Project Dependency -}}} - -############################################################################### - Project: "Messaging_Static"=.\tao\Messaging\TAO_Messaging_Static.dsp - Package Owner=<4> Package=<5> diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp index 957eb4161e3..d66c804bbe9 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.dsp @@ -163,10 +163,22 @@ SOURCE=.\CosLoadBalancingS.cpp # End Source File # Begin Source File +SOURCE=.\LoadBalancing\LB_ClientRequestInterceptor.cpp +# End Source File +# Begin Source File + +SOURCE=.\LoadBalancing\LB_Component.cpp +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_CPU_Monitor.cpp # End Source File # Begin Source File +SOURCE=.\LoadBalancing\LB_IORInterceptor.cpp +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_LeastLoaded.cpp # End Source File # Begin Source File @@ -207,10 +219,18 @@ SOURCE=.\LoadBalancing\LB_MonitorMap.cpp # End Source File # Begin Source File +SOURCE=.\LoadBalancing\LB_ObjectReferenceFactory.cpp +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_ORBInitializer.cpp # End Source File # Begin Source File +SOURCE=.\LB_ORTC.cpp +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_Pull_Handler.cpp # End Source File # Begin Source File @@ -243,6 +263,14 @@ SOURCE=.\CosLoadBalancingS_T.h # End Source File # Begin Source File +SOURCE=.\LoadBalancing\LB_ClientRequestInterceptor.h +# End Source File +# Begin Source File + +SOURCE=.\LoadBalancing\LB_Component.h +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_conf.h # End Source File # Begin Source File @@ -251,6 +279,10 @@ SOURCE=.\LoadBalancing\LB_CPU_Monitor.h # End Source File # Begin Source File +SOURCE=.\LoadBalancing\LB_IORInterceptor.h +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_LeastLoaded.h # End Source File # Begin Source File @@ -291,10 +323,18 @@ SOURCE=.\LoadBalancing\LB_MonitorMap.h # End Source File # Begin Source File +SOURCE=.\LoadBalancing\LB_ObjectReferenceFactory.h +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_ORBInitializer.h # End Source File # Begin Source File +SOURCE=.\LB_ORTC.h +# End Source File +# Begin Source File + SOURCE=.\LoadBalancing\LB_Pull_Handler.h # End Source File # Begin Source File @@ -411,6 +451,93 @@ BuildCmds= \ !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\LB_ORT.idl + +!IF "$(CFG)" == "CosLoadBalancing - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputPath=.\LB_ORT.idl +InputName=LB_ORT + +BuildCmds= \ + ..\..\..\bin\Release\tao_idl -Ge 1 -Gv -DCORBA3 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h $(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)" == "CosLoadBalancing - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputPath=.\LB_ORT.idl +InputName=LB_ORT + +BuildCmds= \ + ..\..\..\bin\tao_idl -Ge 1 -Gv -DCORBA3 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h $(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)" == "CosLoadBalancing - Win32 MFC Debug" + +!ELSEIF "$(CFG)" == "CosLoadBalancing - Win32 MFC Release" + +!ENDIF + # End Source File # End Group # Begin Group "Inline Files" @@ -436,6 +563,10 @@ SOURCE=.\LoadBalancing\LB_LeastLoaded.inl SOURCE=.\LoadBalancing\LB_LoadAlert.inl # End Source File +# Begin Source File + +SOURCE=.\LB_ORTC.i +# End Source File # End Group # Begin Group "Template Files" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp b/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp deleted file mode 100644 index 44d1982805d..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing.dsp +++ /dev/null @@ -1,386 +0,0 @@ -# Microsoft Developer Studio Project File - Name="LoadBalancing" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=LoadBalancing - 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 "LoadBalancing.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 "LoadBalancing.mak" CFG="LoadBalancing - Win32 MFC Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "LoadBalancing - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "LoadBalancing - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "LoadBalancing - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "LoadBalancing - 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)" == "LoadBalancing - 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\LoadBalancing" -# 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 "LoadBalancing_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_LOADBALANCING_BUILD_DLL" /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 /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 /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" - -!ELSEIF "$(CFG)" == "LoadBalancing - 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\LoadBalancing" -# 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 "LoadBalancing_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LOADBALANCING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LOADBALANCING" /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 /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 TAOd.lib aced.lib TAO_PortableServerd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# SUBTRACT LINK32 /profile - -!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "LoadBalancing___Win32_MFC_Debug" -# PROP BASE Intermediate_Dir "LoadBalancing___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\LoadBalancing" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LOADBALANCING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LOADBALANCING" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_LOADBALANCING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_LOADBALANCING" /D ACE_HAS_MFC=1 /YX /FD /c -# 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 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# SUBTRACT BASE LINK32 /profile -# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_PortableServermfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# SUBTRACT LINK32 /profile - -!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "LoadBalancing___Win32_MFC_Release" -# PROP BASE Intermediate_Dir "LoadBalancing___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\LoadBalancingMFC" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_LOADBALANCING_BUILD_DLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_LOADBALANCING_BUILD_DLL" /D ACE_HAS_MFC=1 /YX /FD /c -# 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 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancing.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace" -# ADD LINK32 acemfc.lib TAOmfc.lib TAO_PortableServermfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_LoadBalancingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" - -!ENDIF - -# Begin Target - -# Name "LoadBalancing - Win32 Release" -# Name "LoadBalancing - Win32 Debug" -# Name "LoadBalancing - Win32 MFC Debug" -# Name "LoadBalancing - Win32 MFC Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancer_i.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingC.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Minimum_Dispersion.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaLocator.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaProxy.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Round_Robin_Strategy.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancer_i.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_export.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingC.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Minimum_Dispersion.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaLocator.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaProxy.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Round_Robin_Strategy.h -# End Source File -# End Group -# Begin Group "IDL Files" - -# PROP Default_Filter ".idl" -# Begin Source File - -SOURCE=.\LoadBalancing.idl - -!IF "$(CFG)" == "LoadBalancing - Win32 Release" - -# PROP Ignore_Default_Tool 1 -USERDEP__LOADB="..\..\..\bin\Release\tao_idl.exe" -# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName) -InputPath=.\LoadBalancing.idl -InputName=LoadBalancing - -BuildCmds= \ - ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing\loadbalancing_export.h $(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)" == "LoadBalancing - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -USERDEP__LOADB="..\..\..\bin\tao_idl.exe" -# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName) -InputPath=.\LoadBalancing.idl -InputName=LoadBalancing - -BuildCmds= \ - ..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(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)" == "LoadBalancing - Win32 MFC Debug" - -# PROP BASE Ignore_Default_Tool 1 -# PROP Ignore_Default_Tool 1 - -!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Release" - -# PROP BASE Ignore_Default_Tool 1 -# PROP Ignore_Default_Tool 1 - -!ENDIF - -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter ".i" -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancer_i.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_Strategy.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingC.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS.i -# End Source File -# End Group -# Begin Group "Template Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\LoadBalancingS_T.cpp - -!IF "$(CFG)" == "LoadBalancing - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "LoadBalancing - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Debug" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "LoadBalancing - Win32 MFC Release" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "rc" -# Begin Source File - -SOURCE=.\LoadBalancing.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index a9060f495d1..5a063eee433 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -15,12 +15,14 @@ #include "ace/pre.h" -#include "orbsvcs/LB_ORTC.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "orbsvcs/LB_ORTC.h" + /** * @class TAO_LB_Component diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp b/TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp deleted file mode 100644 index 2bad5e4a095..00000000000 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Static.dsp +++ /dev/null @@ -1,291 +0,0 @@ -# Microsoft Developer Studio Project File - Name="LoadBalancing_Static" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=LoadBalancing_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 "LoadBalancing_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 "LoadBalancing_Static.mak" CFG="LoadBalancing_Static - Win32 Static Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "LoadBalancing_Static - Win32 Static Release" (based on "Win32 (x86) Static Library") -!MESSAGE "LoadBalancing_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)" == "LoadBalancing_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\LoadBalancing" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "_MBCS" /D "_LIB" /D "TAO_AS_STATIC_LIBS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /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_LoadBalancings.lib" - -!ELSEIF "$(CFG)" == "LoadBalancing_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\LoadBalancing" -# PROP Target_Dir "" -# 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 "_MBCS" /D "_LIB" /D "TAO_AS_STATIC_LIBS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /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_LoadBalancingsd.lib" - -!ENDIF - -# Begin Target - -# Name "LoadBalancing_Static - Win32 Static Release" -# Name "LoadBalancing_Static - Win32 Static Debug" -# Begin Group "Template Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\LoadBalancingS_T.cpp -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Group "IDL Files" - -# PROP Default_Filter "idl" -# Begin Source File - -SOURCE=.\LoadBalancing.idl - -!IF "$(CFG)" == "LoadBalancing_Static - Win32 Static Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Invoking TAO_IDL on $(InputPath) -InputPath=.\LoadBalancing.idl -InputName=LoadBalancing - -BuildCmds= \ - ..\..\..\bin\Release\tao_idl_static -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing\loadbalancing_export.h $(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)" == "LoadBalancing_Static - Win32 Static Debug" - -# PROP Ignore_Default_Tool 1 -USERDEP__LOADB="..\..\..\bin\tao_idl_static.exe" -# Begin Custom Build - Invoking TAO_IDL on $(InputPath) -InputPath=.\LoadBalancing.idl -InputName=LoadBalancing - -BuildCmds= \ - ..\..\..\bin\tao_idl_static -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h $(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=.\LoadBalancing\LoadBalancer_i.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_Strategy.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingC.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS_T.i -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaProxy.i -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h" -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancer_i.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_export.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_Strategy.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingC.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS_T.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Minimum_Dispersion.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaLocator.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaProxy.h -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Round_Robin_Strategy.h -# End Source File -# End Group -# Begin Group "Source Files" - -# PROP Default_Filter "cpp" -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancer_i.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\LoadBalancing_Strategy.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingC.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancingS.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Minimum_Dispersion.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaLocator.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\ReplicaProxy.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadBalancing\Round_Robin_Strategy.cpp -# End Source File -# End Group -# End Target -# End Project -- cgit v1.2.1