ChangeLogTag: Tue Sep 7 16:31:25 2004 J.T. Conklin <jtc@acorntoolworks.com>

19 files changed, 519 insertions, 75 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 120ee42eeac..3aae5fb3457 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,31 +1,67 @@
 // $Id$
 
-project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming, minimum_corba {
+project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
   sharedname   = TAO_CosEvent
 
-  // Warning : The idlflags must match exactly those used in
-  //           CosNotification, because we don't know which project
-  //           will actually generate the IDL.  For this reason we
-  //           also just use the event_export.h and macros for both
-  //           services.
   idlflags    += -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h
 
-  // Set both DLL flags because of the shared idl files
-  dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL
+  IDL_Files {
+    CosEventComm.idl
+    CosEventChannelAdmin.idl
+  }
+
+  Source_Files {
+    CosEventCommC.cpp
+    CosEventChannelAdminC.cpp
+  }
+
+  Header_Files {
+    CosEventCommC.h
+    CosEventChannelAdminC.h
+  }
+
+  Inline_Files {
+    CosEventCommC.inl
+    CosEventChannelAdminC.inl
+  }
+}
+
+
+project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, ec_typed_events_skel {
+  sharedname   = TAO_CosEvent_Skel
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CosEventCommS.cpp
+    CosEventChannelAdminS.cpp
+  }
+
+  Header_Files {
+    CosEventCommS.h
+    CosEventChannelAdminS.h
+  }
+
+  Inline_Files {
+    CosEventCommS.inl
+    CosEventChannelAdminS.inl
+  }
+}
+
+
+project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, svc_utils {
+  sharedname   = TAO_CosEvent_Serv
+
+  dynamicflags = TAO_EVENT_BUILD_DLL
 
   tagchecks   += CosEvent
 
   IDL_Files {
-    CosEventComm.idl
-    CosEventChannelAdmin.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     CosEvent {
-      CosEventCommC.cpp
-      CosEventChannelAdminC.cpp
-      CosEventCommS.cpp
-      CosEventChannelAdminS.cpp
       CosEvent/CEC_ConsumerAdmin.cpp
       CosEvent/CEC_ConsumerControl.cpp
       CosEvent/CEC_Default_Factory.cpp
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc b/TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc
new file mode 100644
index 00000000000..3acf53a2b6a
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosEvent_Serv\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosEvent_ServDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosEvent_Serv.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc b/TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc
new file mode 100644
index 00000000000..96c8513c4d2
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosEvent_Skel\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosEvent_SkelDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosEvent_Skel.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 0393d500baf..e4f299849b8 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosLifeCycle) : orbsvcslib, core, naming {
+project(CosLifeCycle) : orbsvcslib, core, naming, portableserver {
   sharedname   = TAO_CosLifeCycle
   idlflags    += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h
   dynamicflags = TAO_LIFECYCLE_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index 2a0aa39ac56..714775427b1 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,24 +1,63 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming) : orbsvcslib, core, messaging, svc_utils, iortable {
+project(CosNaming) : orbsvcslib, core {
   sharedname   = TAO_CosNaming
   idlflags    += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=orbsvcs/Naming/naming_export.h
+
+  IDL_Files {
+    CosNaming.idl
+  }
+
+  Source_Files {
+    CosNamingC.cpp
+    Naming/Naming_Client.cpp
+  }
+
+  Header_Files {
+    CosNamingC.h
+    Naming/Naming_Client.h
+  }
+
+  Inline_Files {
+    CosNamingC.inl
+  }
+}
+
+
+project(CosNaming_Skel) : orbsvcslib, core, naming {
+  sharedname   = TAO_CosNaming_Skel
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CosNamingS.cpp
+  }
+
+  Header_Files {
+    CosNamingS.h
+  }
+
+  Inline_Files {
+    CosNamingS.inl
+  }
+}
+  
+
+project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging, svc_utils, iortable {
+  sharedname   = TAO_CosNaming_Serv
   dynamicflags = TAO_NAMING_BUILD_DLL
   tagchecks   += Naming
 
   IDL_Files {
-    CosNaming.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     Naming {
-      CosNamingC.cpp
-      CosNamingS.cpp
       Naming/Entries.cpp
       Naming/Flat_File_Persistence.cpp
       Naming/Hash_Naming_Context.cpp
-      Naming/Naming_Client.cpp
       Naming/Naming_Context_Interface.cpp
       Naming/Naming_Loader.cpp
       Naming/Naming_Server.cpp
@@ -34,7 +73,6 @@ project(CosNaming) : orbsvcslib, core, messaging, svc_utils, iortable {
   
   Header_Files {
     Naming/naming_export.h
-    Naming/Naming_Client.h
     Naming/Naming_Server.h
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc
new file mode 100644
index 00000000000..8a78d7cceae
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosNaming_Serv\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosNaming_ServDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosNaming_Serv.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc
new file mode 100644
index 00000000000..4e11b908403
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosNaming_Skel\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosNaming_SkelDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosNaming_Skel.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 85efeffab2b..b506bcc1700 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,22 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany {
+project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
+
   // Warning : The idlflags must match exactly those used in CosEvent, because
   //           we don't know which project will actually generate the IDL.
   //           For this reason we also just use the event_export.h and macros for
   //           both services.
   idlflags    += -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h
 
-  // Set both DLL flags because of the shared idl files
-  dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL
-
-  tagchecks   += Notify
-
   IDL_Files {
-    CosEventComm.idl
-    CosEventChannelAdmin.idl
     CosNotification.idl
     CosNotifyComm.idl
     CosNotifyFilter.idl
@@ -25,27 +19,84 @@ project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany {
     Event_Forwarder.idl
   }
 
+  Source_Files {
+    CosNotificationC.cpp
+    CosNotifyCommC.cpp
+    CosNotifyFilterC.cpp
+    CosNotifyChannelAdminC.cpp
+    NotifyExtC.cpp
+    Event_ForwarderC.cpp
+    Notify/Notify_Extensions.cpp
+  }
+
+  Header_Files {
+    CosNotificationC.h
+    CosNotifyCommC.h
+    CosNotifyFilterC.h
+    CosNotifyChannelAdminC.h
+    NotifyExtC.h
+    Event_ForwarderC.h
+    Notify/Notify_Extensions.h
+  }
+
+  Inline_Files {
+    CosNotificationC.inl
+    CosNotifyCommC.inl
+    CosNotifyFilterC.inl
+    CosNotifyChannelAdminC.inl
+    NotifyExtC.inl
+    Event_ForwarderC.inl
+  }
+}
+
+
+project(CosNotification_Skel) : orbsvcslib, core, notification {
+  sharedname   = TAO_CosNotification_Skel
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CosNotificationS.cpp
+    CosNotifyCommS.cpp
+    CosNotifyFilterS.cpp
+    CosNotifyChannelAdminS.cpp
+    NotifyExtS.cpp
+    Event_ForwarderS.cpp
+  }
+
+  Header_Files {
+    CosNotificationS.h
+    CosNotifyCommS.h
+    CosNotifyFilterS.h
+    CosNotifyChannelAdminS.h
+    NotifyExtS.h
+    Event_ForwarderS.h
+  }
+
+  Inline_Files {
+    CosNotificationS.inl
+    CosNotifyCommS.inl
+    CosNotifyFilterS.inl
+    CosNotifyChannelAdminS.inl
+    NotifyExtS.inl
+    Event_ForwarderS.inl
+  }
+}
+
+project(CosNotification_Serv) : orbsvcslib, core, notification_skel, dynamicany, etcl {
+  sharedname   = TAO_CosNotification_Serv
+  dynamicflags = TAO_NOTIFY_BUILD_DLL 
+  tagchecks   += Notify
+
+  IDL_Files {
+  }
+
   // The following could be simplified if RT stuff was
   // put into another subdirectory.
 
   Source_Files(ORBSVCS_COMPONENTS) {
     Notify {
-      CosEventCommC.cpp
-      CosEventCommS.cpp
-      CosEventChannelAdminC.cpp
-      CosEventChannelAdminS.cpp
-      CosNotificationC.cpp
-      CosNotificationS.cpp
-      CosNotifyCommC.cpp
-      CosNotifyCommS.cpp
-      CosNotifyFilterC.cpp
-      CosNotifyFilterS.cpp
-      CosNotifyChannelAdminC.cpp
-      CosNotifyChannelAdminS.cpp
-      NotifyExtC.cpp
-      NotifyExtS.cpp
-      Event_ForwarderC.cpp
-      Event_ForwarderS.cpp
       Notify/Admin.cpp
       Notify/AdminProperties.cpp
       Notify/Buffering_Strategy.cpp
@@ -78,7 +129,6 @@ project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany {
       Notify/Notify_Default_EMO_Factory.cpp
       Notify/Notify_Default_POA_Factory.cpp
       Notify/Notify_EventChannelFactory_i.cpp
-      Notify/Notify_Extensions.cpp
       Notify/Object.cpp
       Notify/Peer.cpp
       Notify/POA_Helper.cpp
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc b/TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc
new file mode 100644
index 00000000000..c261ee4d0e9
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosNotification_Serv\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosNotification_ServDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosNotification_Serv.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc b/TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc
new file mode 100644
index 00000000000..534ac2e6d2c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosNotification_Skel\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosNotification_SkelDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosNotification_Skel.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index c67df03f120..95b5795f763 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTime) : orbsvcslib, core, naming {
+project(CosTime) : orbsvcslib, core, portableserver {
   sharedname   = TAO_CosTime
   idlflags    += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h
   dynamicflags = TAO_TIME_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 266b3b40590..c0554537bdf 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,28 +1,73 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading) : orbsvcslib, core, dynamicany, svc_utils {
+project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   idlflags    += -Wb,export_macro=TAO_Trading_Export -Wb,export_include=orbsvcs/Trader/trading_export.h
+
+  IDL_Files {
+    CosTrading.idl
+    CosTradingRepos.idl
+    CosTradingDynamic.idl
+  }
+
+  Source_Files {
+    CosTradingC.cpp
+    CosTradingReposC.cpp
+    CosTradingDynamicC.cpp
+  }
+
+  Header_Files {
+    CosTradingC.h
+    CosTradingReposC.h
+    CosTradingDynamicC.h
+  }
+
+  Inline_Files {
+    CosTradingC.inl
+    CosTradingReposC.inl
+    CosTradingDynamicC.inl
+  }
+}
+
+
+project(CosTrading_Skel) : orbsvcslib, core, trading {
+  sharedname   = TAO_CosTrading_Skel
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CosTradingS.cpp
+    CosTradingReposS.cpp
+    CosTradingDynamicS.cpp
+  }
+
+  Header_Files {
+    CosTradingS.h
+    CosTradingReposS.h
+    CosTradingDynamicS.h
+  }
+
+  Inline_Files {
+    CosTradingS.inl
+    CosTradingReposS.inl
+    CosTradingDynamicS.inl
+  }
+}
+
+project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils {
+  sharedname   = TAO_CosTrading_Serv
   dynamicflags = TAO_TRADING_BUILD_DLL
   tagchecks   += Trader
   pch_header   =
   pch_source   =
 
   IDL_Files {
-    CosTrading.idl
-    CosTradingRepos.idl
-    CosTradingDynamic.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     Trader {
-      CosTradingC.cpp
-      CosTradingS.cpp
-      CosTradingReposC.cpp
-      CosTradingReposS.cpp
-      CosTradingDynamicC.cpp
-      CosTradingDynamicS.cpp
       Trader
     }
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc b/TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc
new file mode 100644
index 00000000000..f079fe2686c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosTrading_Serv\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosTrading_ServDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosTrading_Serv.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc b/TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc
new file mode 100644
index 00000000000..587858c0034
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc
@@ -0,0 +1,30 @@
+#include "..\..\tao\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "CosTrading_Skel\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_CosTrading_SkelDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_CosTrading_Skel.DLL\0"
+            VALUE "ProductName", "ORBSVCS\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 70a66e63193..3185b8b08fe 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
+project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event_serv {
   sharedname   = TAO_DsEventLogAdmin
   idlflags    += -Wb,export_macro=TAO_EventLog_Export -Wb,export_include=orbsvcs/Log/eventlog_export.h
   dynamicflags = TAO_EVENTLOG_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index 46252134318..60d8ac8c459 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -24,7 +24,6 @@
 
 #include "orbsvcs/Event_Service_Constants.h"
 
-#include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/RtecSchedulerS.h"
 #include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
index 5ff0ee122d2..8b637f136e9 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
@@ -1,28 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-
-feature(ec_typed_events): dynamicinterface, ifr_client, taoidldefaults {
+feature(ec_typed_events) {
   macros   += TAO_HAS_TYPED_EVENT_CHANNEL
-  idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=orbsvcs/CosEvent/event_export.h
 
   IDL_Files {
     CosTypedEventComm.idl
     CosTypedEventChannelAdmin.idl
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    CosEvent {
-      CosTypedEventCommC.cpp
-      CosTypedEventChannelAdminC.cpp
-      CosTypedEventCommS.cpp
-      CosTypedEventChannelAdminS.cpp
-      CosEvent/CEC_TypedEvent.cpp
-      CosEvent/CEC_TypedEventChannel.cpp
-      CosEvent/CEC_TypedProxyPushConsumer.cpp
-      CosEvent/CEC_TypedConsumerAdmin.cpp
-      CosEvent/CEC_TypedSupplierAdmin.cpp
-      CosEvent/CEC_DynamicImplementation.cpp
-    }
+  Source_Files {
+    CosTypedEventCommC.cpp
+    CosTypedEventChannelAdminC.cpp
+  }
+
+  Header_Files {
+    CosTypedEventCommC.h
+    CosTypedEventChannelAdminC.h
+  }
+
+  Inline_Files {
+    CosTypedEventCommC.inl
+    CosTypedEventChannelAdminC.inl
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb
new file mode 100644
index 00000000000..8c8fd64b7db
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb
@@ -0,0 +1,17 @@
+// -*- MPC -*-
+// $Id$
+
+feature(ec_typed_events) {
+  macros   += TAO_HAS_TYPED_EVENT_CHANNEL
+
+  Source_Files(ORBSVCS_COMPONENTS) {
+    CosEvent {
+      CosEvent/CEC_TypedEvent.cpp
+      CosEvent/CEC_TypedEventChannel.cpp
+      CosEvent/CEC_TypedProxyPushConsumer.cpp
+      CosEvent/CEC_TypedConsumerAdmin.cpp
+      CosEvent/CEC_TypedSupplierAdmin.cpp
+      CosEvent/CEC_DynamicImplementation.cpp
+    }
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
new file mode 100644
index 00000000000..8d07f9c42c3
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
@@ -0,0 +1,21 @@
+// -*- MPC -*-
+// $Id$
+
+feature(ec_typed_events) : dynamicinterface, ifr_client {
+  macros   += TAO_HAS_TYPED_EVENT_CHANNEL
+
+  Source_Files {
+    CosTypedEventCommS.cpp
+    CosTypedEventChannelAdminS.cpp
+  }
+
+  Header_Files {
+    CosTypedEventCommS.h
+    CosTypedEventChannelAdminS.h
+  }
+
+  Inline_Files {
+    CosTypedEventCommS.inl
+    CosTypedEventChannelAdminS.inl
+  }
+}