ChangeLogTag:Thu Sep 21 10:08:20 2000 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 26 insertions, 107 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index edcb34dc53b..5d8012b07ea 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,28 +1,38 @@
+Thu Sep 21 10:08:20 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * TAOACE.dsw:
+        * orbsvcs/CosEvent_Service/CosEvent_Service.dsp:
+        * orbsvcs/CosEvent_Service/CosEvent_Service.dsw:
+        * orbsvcs/orbsvcs/CosEvent.dsp:
+        * orbsvcs/orbsvcs/CosEvent_Static.dsp:
+          Update project files with the new COS Event Service dependencies
+          and locations.
+
 Thu Sep 21 11:01:22 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* orbsvcs/ImplRepo_Service/ImplRepo.dsw:
+        * orbsvcs/ImplRepo_Service/ImplRepo.dsw:
 
-	  New project added.
+          New project added.
 
-	* orbsvcs/ImplRepo_Service/NT_ImplRepo_Service.dsp:
-	* orbsvcs/ImplRepo_Service/NT_ImplRepo_Service.cpp:
-	* orbsvcs/ImplRepo_Service/NT_ImplRepo_Service.h:
-	* orbsvcs/ImplRepo_Service/NT_ImplRepo_Server.dsp:
+        * orbsvcs/ImplRepo_Service/NT_ImplRepo_Service.dsp:
+        * orbsvcs/ImplRepo_Service/NT_ImplRepo_Service.cpp:
+        * orbsvcs/ImplRepo_Service/NT_ImplRepo_Service.h:
+        * orbsvcs/ImplRepo_Service/NT_ImplRepo_Server.dsp:
 
-	  New files which build the Implementation Repository
-	  as an NT service.
+          New files which build the Implementation Repository
+          as an NT service.
 
-	* orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
+        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
 
-	  Minor change to catch block eroor output message.
+          Minor change to catch block eroor output message.
 
-	* orbsvcs/tests/Implrepo/run_test.pl:
+        * orbsvcs/tests/Implrepo/run_test.pl:
 
-	  Added tests for persistent ImR and ImR as NT service.
+          Added tests for persistent ImR and ImR as NT service.
 
-	* docs/implrepo/usersguide.html:
+        * docs/implrepo/usersguide.html:
 
-	  Added section about persistent ImR.
+          Added section about persistent ImR.
 
 Thu Sep 21 08:33:18 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 46a0952ee9e..2c9d4ce0992 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -110,12 +110,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name TAO_IDL Compiler

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name RTEvent

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name RTSched

-    End Project Dependency

 }}}

 

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

@@ -134,27 +128,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name CosNaming

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name RTEvent

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name RTSched

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "CosEvent_Service_Native"=.\orbsvcs\CosEvent_Service\CosEvent_Service_Native.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name CosEvent

-    End Project Dependency

 }}}

 

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

diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsp
index 2e147d47a57..6fae65ff323 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsp
@@ -50,7 +50,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_CosEvent.lib TAO_RTEvent.lib TAO_CosNaming.lib TAO_RTSched.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

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

 

 !ELSEIF  "$(CFG)" == "CosEvent_Service - Win32 Debug"

 

@@ -74,7 +74,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 TAO_CosEventd.lib TAO_RTEventd.lib TAO_CosNamingd.lib TAO_RTSchedd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

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

 

 !ENDIF 

 

@@ -93,10 +93,6 @@ SOURCE=.\CosEvent_Service.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\CosEvent_Service.h

-# End Source File

 # End Group

 # End Target

 # End Project

diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsw b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsw
index 4800b64d912..d893bea034a 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsw
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsw
@@ -15,18 +15,6 @@ Package=<4>
 

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

 

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Global:

 

 Package=<5>

diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp b/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp
index 53a3c31be87..366a4810dc5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Static.dsp
@@ -449,14 +449,6 @@ SOURCE=.\CosEvent\CEC_SupplierControl.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ConsumerAdmin_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent_Utilities.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosEventChannelAdminC.h

 # End Source File

 # Begin Source File

@@ -483,22 +475,6 @@ SOURCE=.\CosEventCommS_T.h
 

 SOURCE=.\CosEvent\event_export.h

 # End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\EventChannel_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ProxyPushConsumer_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ProxyPushSupplier_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\SupplierAdmin_i.h

-# End Source File

 # End Group

 # Begin Group "Source Files"

 

@@ -577,14 +553,6 @@ SOURCE=.\CosEvent\CEC_SupplierControl.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ConsumerAdmin_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent_Utilities.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosEventChannelAdminC.cpp

 # End Source File

 # Begin Source File

@@ -599,22 +567,6 @@ SOURCE=.\CosEventCommC.cpp
 

 SOURCE=.\CosEventCommS.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\EventChannel_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ProxyPushConsumer_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\SupplierAdmin_i.cpp

-# End Source File

 # End Group

 # End Target

 # End Project