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

59 files changed, 577 insertions, 133 deletions

diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 97361a68618..1287013fe4b 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, concurrency, naming {
+project : orbsvcsexe, core, concurrency, naming_serv {
   exename  = Concurrency_Service
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index d5c50ee1e2f..220aa334965 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, event, naming, svc_utils, iortable, messaging, portableserver {
+project : orbsvcsexe, core, event_serv, naming, svc_utils, iortable, messaging, portableserver {
   exename  = CosEvent_Service
 }
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
index b3dadfc1daf..fcf1d07ad22 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification {
+project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel {
   after    += FaultTolerance
   exename   = ftrtec_factory_service
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index c2a7cbd377d..65adb29cd92 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portablegroup, minimum_corba {
+project(*Lib): orbsvcslib, core, fault_tolerance, ftorb, portablegroup, minimum_corba {
   sharedname   = TAO_ReplicationManagerLib
   dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL
 
@@ -11,7 +11,7 @@ project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portableg
   }
 }
 
-project : taoserver, orbsvcsexe, fault_tolerance, iormanip, ftorb {
+project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb {
   exename  = FT_ReplicationManager
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index 5f079ce6c8a..ae081aaa722 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, orbsvcsexe, fault_tolerance, notification {
+project : taoserver, orbsvcsexe, fault_tolerance, notification_serv {
   exename  = Fault_Notifier
   Source_Files {
     FT_Notifier_i.cpp
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 78caf4b51cf..1375457f260 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, lifecycle, naming, trading, minimum_corba {
+project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba {
   exename  = LifeCycle_Service
 }
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
index cf15da6e37b..2574a799cfd 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc
@@ -3,7 +3,7 @@
 // $Id$
 
 
-project(LoadManager): namingexe, portableserver, core, iormanip, loadbalancing {
+project(LoadManager): namingexe, portableserver, core, iortable, iormanip, loadbalancing {
   exename  = LoadManager
   requires += ami interceptors
   Source_Files {
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
index ea990697888..019b1c39b0d 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project: namingexe, dsnotifylogadmin {
+project: namingexe, dsnotifylogadmin, iortable {
   exename   = Notify_Logging_Service
   includes += $(TAO_ROOT)/orbsvcs
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index ff877b2864f..7a96a9e6d25 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming {
+project : orbsvcsexe, core, naming_serv {
   exename  = Naming_Service
   Source_Files {
     Naming_Server.cpp
@@ -9,7 +9,7 @@ project : orbsvcsexe, core, naming {
   }
 }
 
-project(NT_Naming_Service) : orbsvcsexe, core, naming {
+project(NT_Naming_Service) : orbsvcsexe, core, naming_serv {
   exename  = NT_Naming_Service
   Source_Files {
     Naming_Service.cpp
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 69a9fe56a6b..61fa82afa05 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, notification, naming {
+project : orbsvcsexe, core, notification_serv, naming, iortable {
   exename  = Notify_Service
   Source_Files {
     Notify_Server.cpp
@@ -12,7 +12,7 @@ project : orbsvcsexe, core, notification, naming {
   }
 }
 
-project(NT_Notify_Service) : orbsvcsexe, core, notification, naming {
+project(NT_Notify_Service) : orbsvcsexe, core, notification_serv, naming, iortable {
   exename  = NT_Notify_Service
   Source_Files {
     Notify_Service.cpp
diff --git a/TAO/orbsvcs/TAO_Service/svc.conf b/TAO/orbsvcs/TAO_Service/svc.conf
index 94d84ad5d3d..6168a3a624d 100644
--- a/TAO/orbsvcs/TAO_Service/svc.conf
+++ b/TAO/orbsvcs/TAO_Service/svc.conf
@@ -1,14 +1,14 @@
 # Dynamically configure the naming service into the application process.
-#dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming:_make_TAO_Naming_Loader () "dummy -o ns.ior"
+#dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming_Serv:_make_TAO_Naming_Loader () "dummy -o ns.ior"
 
 # Dynamically configure the default Event Service Factory
-#dynamic CEC_Factory Service_Object * TAO_CosEvent:_make_TAO_CEC_Default_Factory () ""
+#dynamic CEC_Factory Service_Object * TAO_CosEvent_Serv:_make_TAO_CEC_Default_Factory () ""
 
 # Dynamically configure the naming service into the application process.
-#dynamic TAO_CEC_Event_Loader Service_Object * TAO_CosEvent:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref -x"
+#dynamic TAO_CEC_Event_Loader Service_Object * TAO_CosEvent_Serv:_make_TAO_CEC_Event_Loader () "dummy -o foo.ref -x"
 
 # Dynamically configure the trading service into the application process.
-#dynamic TAO_Trading_Loader Service_Object * TAO_CosTrading:_make_TAO_Trading_Loader () "dummy -TSdumpior footra.ref"
+#dynamic TAO_Trading_Loader Service_Object * TAO_CosTrading_Serv:_make_TAO_Trading_Loader () "dummy -TSdumpior footra.ref"
 
 #Dynamically remove the trading service from the application process
 #remove TAO_Trading_Loader
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index a3e8eed4121..865cc01d9fc 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Time_Service_Server) : orbsvcsexe, core, time {
+project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv {
   exename  = Time_Service_Server
   Source_Files {
     Server_i.cpp
@@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe, core, time {
   }
 }
 
-project(Time_Service_Clerk) : orbsvcsexe, core, time {
+project(Time_Service_Clerk) : orbsvcsexe, core, time, naming_serv {
   exename  = Time_Service_Clerk
   Source_Files {
     Clerk_i.cpp
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index 0bd2fdc6201..46950125c54 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming, trading {
+project : orbsvcsexe, core, naming, trading_serv {
   exename  = Trading_Service
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
index 9f36dda8a84..f4102c447d6 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : orbsvcsexe, event {
+project(*Client) : orbsvcsexe, event, event_skel, naming {
   idlflags += -I ../../..
   source_files {
     FactoryClient.cpp
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
index aa651b338c2..284f26d7205 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, rtevent, event {
+project : orbsvcsexe, rtevent, event, event_skel {
   after += CosEC_RtEC_Based_lib
   includes += ../lib
   libs += CosEC_RtEC_Based
   libpaths += ../lib
-}
\ No newline at end of file
+}
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
index 89c0143b7cd..1cd65727ebb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : orbsvcsexe, event, rtevent, rtsched {
+project(*Client) : orbsvcsexe, event, event_skel, rtevent, rtsched {
   after += CosEC_RtEC_Based_lib
   includes += ../../lib
   libs += CosEC_RtEC_Based
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index ee8fe174725..3018aa6b8df 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Cons) : orbsvcsexe, event, rtevent, rtsched {
+project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched {
   after += CosEC_RtEC_Based_lib
   includes += ../../lib
   libs += CosEC_RtEC_Based
@@ -12,7 +12,7 @@ project(*Cons) : orbsvcsexe, event, rtevent, rtsched {
   }
 }
 
-project(*Supp) : orbsvcsexe, event, rtevent, rtsched {
+project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched {
   after += CosEC_RtEC_Based_lib
   includes += ../../lib
   libs += CosEC_RtEC_Based
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
index a423f5f1075..7a91454ad07 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
@@ -1,19 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Service) : orbsvcsexe, event {
+project(*Service) : orbsvcsexe, event, event_serv, naming {
   Source_Files {
     Service.cpp
   }
 }
 
-project(*Consumer) : orbsvcsexe, event {
+project(*Consumer) : orbsvcsexe, event, event_skel {
   Source_Files {
     Consumer.cpp
   }
 }
 
-project(*Supplier) : orbsvcsexe, event {
+project(*Supplier) : orbsvcsexe, event, event_skel {
   Source_Files {
     Supplier.cpp
   }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
index 061cdf7d4ae..0c0e54324fc 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
+++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, notification, naming {
+project : orbsvcsexe, notification, notification_skel, naming {
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index 4e1a9ef09ce..6684e2215b1 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, notification, naming, minimum_corba {
+project : orbsvcsexe, notification, notification_skel, naming, minimum_corba {
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf
index f197dcef2ee..80a46e01105 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
-##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
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
+  }
+}
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index d4105cbe2a9..2065860ebb8 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable {
+project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iortable {
   after    += CosEvent_Test_Lib
   libs     += CECTests
   includes += ../lib
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index 80540d3324b..6ce793d80df 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -59,7 +59,7 @@ project(*Notifier): taoserver, fault_tolerance, iormanip, orbsvcsexe, minimum_co
   }
 }
 
-project(*Analyzer): taoclient, fault_tolerance, orbsvcsexe {
+project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe {
   exename = ft_analyzer
 
   Source_Files {
@@ -76,7 +76,7 @@ project(*Analyzer): taoclient, fault_tolerance, orbsvcsexe {
   }
 }
 
-project(*FaultConsumer): taoserver, fault_tolerance, orbsvcsexe, minimum_corba {
+project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, minimum_corba {
   exename = ft_fault_consumer
   libs    += TAO_ReplicationManagerLib
   after   += FT_ReplicationManager_Lib
diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
index 0949799b83d..ae73b4ba0d3 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
+++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe {
+project(*server): namingexe, iortable, svc_utils {
   Source_Files {
     server_i.cpp
     MCast_Server_i.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe {
   }
 }
 
-project(*client): namingexe {
+project(*client): namingexe, iortable, svc_utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
index 42c4e3b8849..831fed1a8d3 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: namingexe {
+project: namingexe, portableserver {
   exename = client
-}
\ No newline at end of file
+}
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 2c4aeb81e78..1a07e216014 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -22,7 +22,7 @@
 #include "ace/SString.h"
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "Command.h"
-#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
+//#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
 
 class TAO_Notify_Service;
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
index 8706e4bd882..0515ecbd0db 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
index aa0e93c02df..a747c353448 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
index 8706e4bd882..0515ecbd0db 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
index aa0e93c02df..a747c353448 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
index acb3f6fee00..cc59624b3fb 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
@@ -3,7 +3,7 @@
 # Note that this test is not portable because it does not use RTCORBA.
 # All priority values are for Linux
 #
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
 
 ##---- Load the Factories------
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
index 33d916bf88f..fcaa0f1cc8f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
@@ -2,7 +2,7 @@
 
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
index b9b7b4b50cc..61456d1a199 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""         
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""         
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
index aa0e93c02df..a747c353448 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
index 8706e4bd882..0515ecbd0db 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
@@ -1,2 +1,2 @@
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification:_make_TAO_CosNotify_Service () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
index aa0e93c02df..a747c353448 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
@@ -1,3 +1,3 @@
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () ""
+dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
index 18f3e669754..bbeedbc28fb 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
+++ b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : namingexe {
+project(*Client) : namingexe, portableserver {
   exename  = client
 }
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
index f7a14d12a38..97620a0feb0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : namingexe {
+project(*Client) : namingexe, portableserver {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index 45c782c3665..860097c4c1b 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test Lib): orbsvcslib, trading, naming, svc_utils, iortable, dynamicany, portableserver {
+project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynamicany, portableserver {
   sharedname = TTest
   idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h
   dynamicflags = TAO_TTEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
index a79ed9647e8..93e27debf15 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming {
+project(*server): namingexe, portableserver {
   Source_Files {
     status_i.cpp
     server.cpp
   }
 }
 
-project(*client): namingexe {
+project(*client): namingexe, portableserver {
   exename = client
 
   Source_Files {