ChangeLogTag: Wed Mar 12 09:48:32 2003 Chad Elliott <elliott_c@ociweb.com>

9 files changed, 152 insertions, 238 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1797f3f7c0c..b4ea7072e3c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,29 @@
+Wed Mar 12 09:48:32 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        Committing Paul Calabrese's <calabrese_p@ociweb.com> MPC related
+        changes.
+
+        * orbsvcs/orbsvcs/AV.mpc:
+
+          Add a dependency on the ACE_QoS library.
+
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/CosTime.mpc:
+        * orbsvcs/orbsvcs/RTSched.mpc:
+
+          Update these files so we can build the services with MPC
+          on Windows.
+
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+
+          Add missing mpc file for logging service.
+
+        * orbsvcs/orbsvcs/AV/media-timer.h:
+        * orbsvcs/orbsvcs/AV/media-timer.cpp:
+
+          Removed these files.  They were not removed after the rename.
+
 Tue Mar 11 18:00:12 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile: Added
@@ -7,31 +33,31 @@ Tue Mar 11 18:00:12 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
 Tue Mar 11 11:58:12 2003  Ossama Othman  <ossama@uci.edu>
 
-	* orbsvcs/tests/Security/Secure_Invocation/Makefile:
-	* orbsvcs/tests/Security/SecurityLevel1/Makefile:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile:
+        * orbsvcs/tests/Security/SecurityLevel1/Makefile:
 
-	  Add PLATFORM_SSL_* variables to their corresponding CPPFLAGS and
-	  LDFLAGS "make" variables.  This fixes problems on platforms
-	  where OpenSSL is installed in a location unknown to the compiler
-	  and linker.  Thanks to Phil Mesnier <mesnier_p@ociweb.com> for
-	  detecting the problem.
+          Add PLATFORM_SSL_* variables to their corresponding CPPFLAGS and
+          LDFLAGS "make" variables.  This fixes problems on platforms
+          where OpenSSL is installed in a location unknown to the compiler
+          and linker.  Thanks to Phil Mesnier <mesnier_p@ociweb.com> for
+          detecting the problem.
 
 Tue Mar 11 10:46:29 2003  Ossama Othman  <ossama@uci.edu>
 
-	* tao/corbafwd.h:
+        * tao/corbafwd.h:
 
-	  Removed CORBA::{add,remove}_ref() static function declarations.
-	  They conflicted with the ones defined in `ValueBase.h'.
+          Removed CORBA::{add,remove}_ref() static function declarations.
+          They conflicted with the ones defined in `ValueBase.h'.
 
-	* tao/ValueBase.h:
+        * tao/ValueBase.h:
 
-	  Corrected CORBA::{add,remove}_ref() static function declarations
-	  so that "inconsistent DLL linkage" warnings no longer occur in
-	  MS Windows TAO builds.
+          Corrected CORBA::{add,remove}_ref() static function declarations
+          so that "inconsistent DLL linkage" warnings no longer occur in
+          MS Windows TAO builds.
 
-	  Include "ace/Basic_Types.h" instead of "ace/OS.h".  The former
-	  is all that is needed for the "ptr_arith_t" typedef.  Inclusion
-	  of "ace/OS.h" is overkill.
+          Include "ace/Basic_Types.h" instead of "ace/OS.h".  The former
+          is all that is needed for the "ptr_arith_t" typedef.  Inclusion
+          of "ace/OS.h" is overkill.
 
 Mon Mar 10 20:24:17 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
@@ -40,87 +66,87 @@ Mon Mar 10 20:24:17 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
 Mon Mar 10 11:03:14 2003  Ossama Othman  <ossama@uci.edu>
 
-	* tao/DynamicInterface/DII_ClientRequestInfo.h (request_):
+        * tao/DynamicInterface/DII_ClientRequestInfo.h (request_):
 
-	  Changed the type of this class member from CORBA::Request_var to
-	  CORBA::Request_ptr.  There is no need to use "_var" type in this
-	  case.
+          Changed the type of this class member from CORBA::Request_var to
+          CORBA::Request_ptr.  There is no need to use "_var" type in this
+          case.
 
-	* tao/DynamicInterface/DII_ClientRequestInfo.cpp
-	  (TAO_DII_ClientRequestInfo):
+        * tao/DynamicInterface/DII_ClientRequestInfo.cpp
+          (TAO_DII_ClientRequestInfo):
 
-	  No need to increase the reference count since the "request_"
-	  member is no longer a "_var" type, and since the
-	  TAO_DII_ClientRequestInfo instance used in the
-	  CORBA::Request::invoke() methd is local to that method.  This is
-	  a lighter weight solution to the problem that Phil Mesnier
-	  detected and fixed since no CORBA::Request reference count locks
-	  are used.
+          No need to increase the reference count since the "request_"
+          member is no longer a "_var" type, and since the
+          TAO_DII_ClientRequestInfo instance used in the
+          CORBA::Request::invoke() methd is local to that method.  This is
+          a lighter weight solution to the problem that Phil Mesnier
+          detected and fixed since no CORBA::Request reference count locks
+          are used.
 
-	* examples/Callback_Quoter/Supplier_i.cpp (run):
+        * examples/Callback_Quoter/Supplier_i.cpp (run):
 
-	  Fixed unused value warning.
+          Fixed unused value warning.
 
 Mon Mar 10 08:10:02 2003  Ossama Othman  <ossama@uci.edu>
 
-	* orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp (setup_multicast):
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp (setup_multicast):
 
-	  Fixed unused argument warning on platforms where
-	  ACE_HAS_IP_MULTICAST is not defined.
+          Fixed unused argument warning on platforms where
+          ACE_HAS_IP_MULTICAST is not defined.
 
-	* orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
-	  (TAO_Log_Constraint_Visitor):
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+          (TAO_Log_Constraint_Visitor):
 
-	  Added missing semi-colon for the ACE_LACKS_LONGLONG_T case.
-	  Fixes a syntax error.
+          Added missing semi-colon for the ACE_LACKS_LONGLONG_T case.
+          Fixes a syntax error.
 
-	* orbsvcs/orbsvcs/Log/Log_i.cpp (copy_attributes):
+        * orbsvcs/orbsvcs/Log/Log_i.cpp (copy_attributes):
 
-	  Return value of get_max_size() should be assigned to a
-	  CORBA::ULongLong, not CORBA::ULong.
+          Return value of get_max_size() should be assigned to a
+          CORBA::ULongLong, not CORBA::ULong.
 
-	  (remove_old_records):
-	  (check_capacity_alarm_threshold)
-	  (reset_capacity_alarm_threshold):
+          (remove_old_records):
+          (check_capacity_alarm_threshold)
+          (reset_capacity_alarm_threshold):
 
-	  Corrected CORBA::LongLong/ULongLong mismatches.
+          Corrected CORBA::LongLong/ULongLong mismatches.
 
-	  Use the ACE_UINT64_DBLCAST_ADAPTER macro when casting a
-	  CORBA::ULongLong to a double to work around problems when
-	  CORBA::ULongLong is an emulated type.
+          Use the ACE_UINT64_DBLCAST_ADAPTER macro when casting a
+          CORBA::ULongLong to a double to work around problems when
+          CORBA::ULongLong is an emulated type.
 
-	* orbsvcs/orbsvcs/Log/LogRecordStore.cpp (purge_old_records):
+        * orbsvcs/orbsvcs/Log/LogRecordStore.cpp (purge_old_records):
 
-	  Do not explicitly cast integers to a CORBA::ULongLong.  That
-	  breaks on platforms where 64 bit integers are emulated.
+          Do not explicitly cast integers to a CORBA::ULongLong.  That
+          breaks on platforms where 64 bit integers are emulated.
 
-	  Changed loop variable type to match the type used in the
-	  comparison that dictates when the loop should stop,
-	  i.e. "CORBA::ULong" -> "CORBA::ULongLong".
+          Changed loop variable type to match the type used in the
+          comparison that dictates when the loop should stop,
+          i.e. "CORBA::ULong" -> "CORBA::ULongLong".
 
-	* orbsvcs/orbsvcs/Log/Log_i.cpp (retrieve):
+        * orbsvcs/orbsvcs/Log/Log_i.cpp (retrieve):
 
-	  Corrected format specifier for platforms that lack 64 bit
-	  integer support.
+          Corrected format specifier for platforms that lack 64 bit
+          integer support.
 
-	* orbsvcs/orbsvcs/Log/PersistStore.cpp (get_percentage_full):
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp (get_percentage_full):
 
-	  Explicitly mark the integer literal used in a multiplication
-	  with a CORBA::ULongLong variable as unsigned since there is no
-	  operator that multiplies a signed integer with a
-	  CORBA::ULongLong on platforms where the latter is emulated,
-	  i.e. no native 64 bit unsigned integer exists.
+          Explicitly mark the integer literal used in a multiplication
+          with a CORBA::ULongLong variable as unsigned since there is no
+          operator that multiplies a signed integer with a
+          CORBA::ULongLong on platforms where the latter is emulated,
+          i.e. no native 64 bit unsigned integer exists.
 
-	* tao/orbconf.h:
+        * tao/orbconf.h:
 
-	  Removed redefinition of ACE_NESTED_CLASS macro, and include
-	  "ace/Global_Macros.h" instead.  It is already defined in that
-	  header.
+          Removed redefinition of ACE_NESTED_CLASS macro, and include
+          "ace/Global_Macros.h" instead.  It is already defined in that
+          header.
 
-	* tests/Nested_Upcall_Crash/server.cpp (main):
+        * tests/Nested_Upcall_Crash/server.cpp (main):
 
-	  Cast the return value of ACE_OS::gethrtime() to ACE_RANDR_TYPE
-	  to fix an error on VxWorks builds.
+          Cast the return value of ACE_OS::gethrtime() to ACE_RANDR_TYPE
+          to fix an error on VxWorks builds.
 
 Mon Mar 10 08:22:01 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -147,16 +173,16 @@ Sun Mar  9 16:04:27 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
 Sun Mar  9 10:06:59 2003  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* docs/compiler.html: Updated the discussion on what files are
- 	  generated by the TAO IDL compiler.  Thanks to Rob Eger
- 	  <reger@txcorp.com> and Carlos O'Ryan for helping with this.
+        * docs/compiler.html: Updated the discussion on what files are
+          generated by the TAO IDL compiler.  Thanks to Rob Eger
+          <reger@txcorp.com> and Carlos O'Ryan for helping with this.
 
 Sat Mar 08 15:27:14 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
-	* tao/orbconf.h: The #define for ACE_NESTED_CLASS was busted. The
-	  workaround should be applied on platforms where
-	  ACE_HAS_BROKEN_NAMESPACES is defined instead of just
-	  Win32. Thanks to Johnny Willemsen fo rcatching this.
+        * tao/orbconf.h: The #define for ACE_NESTED_CLASS was busted. The
+          workaround should be applied on platforms where
+          ACE_HAS_BROKEN_NAMESPACES is defined instead of just
+          Win32. Thanks to Johnny Willemsen fo rcatching this.
 
 Fri Mar  7 17:20:24 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
@@ -170,14 +196,14 @@ Fri Mar  7 14:17:10 2003  Phil Mesnier  <mesnier_p@ociweb.com>
         * tests/Param_Test/svc.conf.xml: I neglected add the change for
           setting the native wchar codeset id to the xml form of the
           service config. This should address the errors with the wstring
-	  data.
+          data.
 
 Fri Mar  7 10:58:32 2003  Ossama Othman  <ossama@uci.edu>
 
         * tests/Codec/test.idl (Foo::Bar::C):
 
           Changed type of this attribute from "long long" to "unsigned
-	  long long".  It is better supported/emulated by ACE and TAO on
+          long long".  It is better supported/emulated by ACE and TAO on
           platforms that lack 64 bit integer support (e.g. VxWorks).
 
         * tests/Codec/client.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 2589d9ced0f..07040bf9e82 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,5 +1,5 @@
 project(AV) : orbsvcslib, core {
-  depends    += CosProperty CosNaming Svc_Utils PortableServer
+  depends    += CosProperty CosNaming Svc_Utils PortableServer QoS
   sharedname  = TAO_AV
   libs       += TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
   idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h
diff --git a/TAO/orbsvcs/orbsvcs/AV/media-timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media-timer.cpp
deleted file mode 100644
index d3a2285f861..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/media-timer.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//$Id$
-/*
- * Copyright (c) 1995 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Computer Systems
- *      Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
-static const char rcsid[] =
-    "@(#) $Header$";
-*/
-
-#include "media-timer.h"
-// FUZZ: disable check_for_math_include
-#include <math.h>
-
-
-MediaTimer* MediaTimer::instance_;
-
-MediaTimer::MediaTimer()
-{
-        instance_ = this;
-        offset_ = ACE_OS::rand ();
-}
-
-MediaTimer::~MediaTimer()
-{
-        instance_ = 0;
-}
-
-/*
- * Default media timestamp -- convert unix system clock
- * into a 90Khz timestamp.  Grabbers override this virtual
- * method if they can provide their own time base.
- *
- * XXX
- * We save the corresponding unix time stamp to handle the
- * unix_ts() call the transmitter will make to get the correspondence
- * between the media timestamp & unix time.
- */
-ACE_UINT32 MediaTimer::media_ts()
-{
-  //timeval tv;
-  ACE_Time_Value tv = ACE_OS::gettimeofday();
-  ACE_UINT32 u = tv.usec ();
-  u = (u << 3) + u; /* x 9 */
-        /* sec * 90Khz + (usec * 90Khz) / 1e6 */
-        u = tv.sec () * 90000 + (u / 100);
-        return (u + offset_);
-}
-
-/*
- * compute media time corresponding to the current unix time.
- * in this generic routine, this is the same as media_ts() but,
- * if a grabber has hardware or kernel timestamping, this routine
- * must compute the correspondence between the hardware timestamp
- * and the unix clock and appropriately offset the timestamp to
- * correspond to the current clock.  (This information if vital
- * for cross-media synchronization.)
- */
-ACE_UINT32 MediaTimer::ref_ts()
-{
-        return (media_ts());
-}
diff --git a/TAO/orbsvcs/orbsvcs/AV/media-timer.h b/TAO/orbsvcs/orbsvcs/AV/media-timer.h
deleted file mode 100644
index c49126a9431..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/media-timer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-/*
- * Copyright (c) 1995 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Computer Systems
- *      Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#) $Header$
- */
-
-#ifndef TAO_AV_MEDIA_TIMER_H
-#define TAO_AV_MEDIA_TIMER_H
-#include "ace/pre.h"
-
-#include "ace/OS.h"
-//long random (void);
-
-class MediaTimer
-{
- public:
-  MediaTimer();
-  virtual ~MediaTimer();
-  static inline MediaTimer* instance() { return (instance_); }
-  virtual ACE_UINT32 media_ts();
-  virtual ACE_UINT32 ref_ts();
-  inline ACE_UINT32 offset() const { return (offset_); }
- private:
-  static MediaTimer* instance_;
- protected:
-  ACE_UINT32 offset_;   /* random offset */
-};
-
-#include "ace/post.h"
-#endif /* TAO_AV_MEDIA_TIMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 0631d10f610..2a0889f1d3e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,9 +1,10 @@
 project(CosEvent) : orbsvcslib, core {
-  depends    += CosNaming Svc_Utils PortableServer
+  depends    += CosNaming Svc_Utils PortableServer Messaging
   sharedname  = TAO_CosEvent
   libs       += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
   idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
-  dllflags    = TAO_EVENT_BUILD_DLL
+  // Set both DLL flags because of the shared idl files
+  dllflags    = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL
   tagchecks   = CosEvent
   include_dir = orbsvcs
 
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 8e6b5577fef..1a8fc3e6870 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -3,7 +3,8 @@ project(CosNotification) : orbsvcslib, core {
   sharedname  = TAO_CosNotification
   libs       += TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO
   idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h
-  dllflags    = TAO_NOTIFY_BUILD_DLL
+  // Set both DLL flags because of the shared idl files
+  dllflags    = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL
   tagchecks   = Notify
   include_dir = orbsvcs
 
@@ -14,6 +15,8 @@ project(CosNotification) : orbsvcslib, core {
     CosNotifyComm.idl
     CosNotifyFilter.idl
     CosNotifyChannelAdmin.idl
+    NotifyExt.idl
+    Event_Forwarder.idl
   }
 
   Source_Files(ORBSVCS_COMPONENTS) {
@@ -30,7 +33,14 @@ project(CosNotification) : orbsvcslib, core {
       CosNotifyFilterS.cpp
       CosNotifyChannelAdminC.cpp
       CosNotifyChannelAdminS.cpp
+      NotifyExtC.cpp
+      NotifyExtS.cpp
+      Event_ForwarderC.cpp
+      Event_ForwarderS.cpp
       Notify
+      Notify/Any
+      Notify/Sequence
+      Notify/Structured
     }
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index d04b09d4245..a0682b5634b 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,7 +1,7 @@
 project(CosTime) : orbsvcslib, core {
-  depends    += PortableServer
+  depends    += CosNaming PortableServer
   sharedname  = TAO_CosTime
-  libs       += TAO_PortableServer TAO
+  libs       += TAO_CosNaming TAO_PortableServer TAO
   idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h
   dllflags    = TAO_TIME_BUILD_DLL
   tagchecks   = Time
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
new file mode 100644
index 00000000000..f03fae1cd89
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -0,0 +1,24 @@
+project(DsNotifyLogAdmin) : orbsvcslib, core {
+  depends    += CosNotification DsEventLogAdmin DsLogAdmin ETCL CosTrading Svc_Utils DynamicAny PortableServer
+  sharedname  = TAO_DsNotifyLogAdmin
+  libs       += TAO_CosNotification TAO_DsEventLogAdmin TAO_DsLogAdmin TAO_ETCL TAO_CosTrading TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log/notifylog_export.h
+  dllflags    = TAO_NOTIFYLOG_BUILD_DLL
+  tagchecks   = Log
+  include_dir = orbsvcs
+
+  IDL_Files {
+    DsNotifyLogAdmin.idl
+  }
+
+  Source_Files(ORBSVCS_COMPONENTS) {
+    Log {
+      DsNotifyLogAdminC.cpp
+      DsNotifyLogAdminS.cpp
+      Log/NotifyLogFactory_i
+      Log/NotifyLog_i
+      Log/NotifyLogConsumer
+      Log/NotifyLogNotification
+    }
+  }
+}
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index bbb248c8e8a..82f5a71bcdd 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -21,4 +21,9 @@ project(RTSched) : orbsvcslib, core {
       Sched
     }
   }
+
+  // To avoid picking up RTSchedEvent.rc as well, explicitly list the files.
+  Resource_Files {
+    RTSched.rc
+  }
 }