ChangeLogTag: Tue Jul 9 07:14:38 2002 Chad Elliott <elliott_c@ociweb.com>

63 files changed, 1309 insertions, 308 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc
new file mode 100644
index 00000000000..d85f7d336c4
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVStreams_Asynch_Three_Stage.mpc
@@ -0,0 +1,27 @@
+project(sender): orbsvcsexe, avstreamsexe {
+  exename  = sender
+
+  Source_Files {
+    Connection_Manager.cpp
+    sender.cpp
+  }
+}
+
+project(distributer): orbsvcsexe, avstreamsexe {
+  exename  = distributer
+
+  Source_Files {
+    Connection_Manager.cpp
+    distributer.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  exename  = receiver
+
+  Source_Files {
+    Connection_Manager.cpp
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc
new file mode 100644
index 00000000000..3fafd05d6f0
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVStreams_Bidirectional_Flows.mpc
@@ -0,0 +1,16 @@
+project(sender): orbsvcsexe, avstreamsexe {
+  exename  = sender
+
+  Source_Files {
+    sender.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  exename  = receiver
+
+  Source_Files {
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc
new file mode 100644
index 00000000000..4d4eb2bf3ed
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVStreams_Component_Switching.mpc
@@ -0,0 +1,27 @@
+project(sender): orbsvcsexe, avstreamsexe, strategies {
+  exename  = sender
+
+  Source_Files {
+    Connection_Manager.cpp
+    sender.cpp
+  }
+}
+
+project(distributer): orbsvcsexe, avstreamsexe, strategies {
+  exename  = distributer
+
+  Source_Files {
+    Connection_Manager.cpp
+    distributer.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe, strategies {
+  exename  = receiver
+
+  Source_Files {
+    Connection_Manager.cpp
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc
new file mode 100644
index 00000000000..fb88d5acec7
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVStreams_Full_Profile.mpc
@@ -0,0 +1,16 @@
+project(server): orbsvcsexe, avstreamsexe {
+  exename  = server
+
+  Source_Files {
+    server.cpp
+  }
+}
+
+project(ftp): orbsvcsexe, avstreamsexe {
+  exename  = ftp
+
+  Source_Files {
+    ftp.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc
new file mode 100644
index 00000000000..711cd9d29c4
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/AVStreams_Latency.mpc
@@ -0,0 +1,24 @@
+project(ping): orbsvcsexe, avstreamsexe, strategies {
+  exename  = ping
+
+  Source_Files {
+    ping.cpp
+  }
+}
+
+project(pong): orbsvcsexe, avstreamsexe, strategies {
+  exename  = pong
+
+  Source_Files {
+    pong.cpp
+  }
+}
+
+project(control): orbsvcsexe, avstreamsexe, strategies {
+  exename  = control
+
+  Source_Files {
+    control.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc
new file mode 100644
index 00000000000..3fafd05d6f0
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVStreams_Modify_QoS.mpc
@@ -0,0 +1,16 @@
+project(sender): orbsvcsexe, avstreamsexe {
+  exename  = sender
+
+  Source_Files {
+    sender.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  exename  = receiver
+
+  Source_Files {
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc
new file mode 100644
index 00000000000..16bcdf02d48
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/AVStreams_Multicast.mpc
@@ -0,0 +1,16 @@
+project(server): orbsvcsexe, avstreamsexe, strategies {
+  exename  = server
+
+  Source_Files {
+    server.cpp
+  }
+}
+
+project(ftp): orbsvcsexe, avstreamsexe, strategies {
+  exename  = ftp
+
+  Source_Files {
+    ftp.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc
new file mode 100644
index 00000000000..fb88d5acec7
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVStreams_Multicast_Full_Profile.mpc
@@ -0,0 +1,16 @@
+project(server): orbsvcsexe, avstreamsexe {
+  exename  = server
+
+  Source_Files {
+    server.cpp
+  }
+}
+
+project(ftp): orbsvcsexe, avstreamsexe {
+  exename  = ftp
+
+  Source_Files {
+    ftp.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc
new file mode 100644
index 00000000000..3fafd05d6f0
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVStreams_Multiple_Flows.mpc
@@ -0,0 +1,16 @@
+project(sender): orbsvcsexe, avstreamsexe {
+  exename  = sender
+
+  Source_Files {
+    sender.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  exename  = receiver
+
+  Source_Files {
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc
new file mode 100644
index 00000000000..fb88d5acec7
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVStreams_Pluggable.mpc
@@ -0,0 +1,16 @@
+project(server): orbsvcsexe, avstreamsexe {
+  exename  = server
+
+  Source_Files {
+    server.cpp
+  }
+}
+
+project(ftp): orbsvcsexe, avstreamsexe {
+  exename  = ftp
+
+  Source_Files {
+    ftp.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc
new file mode 100644
index 00000000000..64014297999
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVStream_Pluggable_Flow_Protocol.mpc
@@ -0,0 +1,26 @@
+project(avstreams ts) : orbsvcslib {
+  sharedname = TAO_TS
+  dllflags   = TAO_AV_BUILD_DLL
+  install    =
+
+  Source_Files {
+    TimeStamp.cpp
+  }
+}
+
+project(sender): orbsvcsexe, avstreamsexe {
+  exename  = sender
+
+  Source_Files {
+    sender.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  exename  = receiver
+
+  Source_Files {
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc
new file mode 100644
index 00000000000..14656da768d
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVStreams_Simple_Three_Stage.mpc
@@ -0,0 +1,24 @@
+project(sender): orbsvcsexe, avstreamsexe {
+  exename  = sender
+
+  Source_Files {
+    sender.cpp
+  }
+}
+
+project(distributer): orbsvcsexe, avstreamsexe {
+  exename  = distributer
+
+  Source_Files {
+    distributer.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  exename  = receiver
+
+  Source_Files {
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc
new file mode 100644
index 00000000000..3fafd05d6f0
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVStreams_Simple_Two_Stage.mpc
@@ -0,0 +1,16 @@
+project(sender): orbsvcsexe, avstreamsexe {
+  exename  = sender
+
+  Source_Files {
+    sender.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  exename  = receiver
+
+  Source_Files {
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc
new file mode 100644
index 00000000000..d5ea16da14d
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVStreams_Simple_Two_Stage_With_QoS.mpc
@@ -0,0 +1,20 @@
+project(sender): orbsvcsexe, avstreamsexe {
+  depends += QoS
+  libs    += ACE_QoS
+  exename  = sender
+
+  Source_Files {
+    sender.cpp
+  }
+}
+
+project(receiver): orbsvcsexe, avstreamsexe {
+  depends += QoS
+  libs    += ACE_QoS
+  exename  = receiver
+
+  Source_Files {
+    receiver.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
new file mode 100644
index 00000000000..5d3a7bf18fe
--- /dev/null
+++ b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
@@ -0,0 +1,5 @@
+project(CC client) : orbsvcsexe {
+  depends += CosConcurrency CosNaming Svc_Utils IORTable PortableServer
+  libs    += TAO_CosConcurrency TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer
+  exename  = CC_client
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
deleted file mode 100644
index 16dea85c540..00000000000
--- a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Naming_Service/TAO
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA client for the CosNaming
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "NS_client.h"
-#include "tao/debug.h"
-#include <stdio.h>
-
-ACE_RCSID(Concurrency, NS_client, "$Id$")
-
-// constructor
-
-CosNaming_Client::CosNaming_Client (void)
-  : list_contents_ (0),
-    resolve_name_ (0),
-    name_to_resolve_ (0),
-    context_to_resolve_ (0),
-    argc_ (0),
-    argv_ (0),
-    exit_later_ (0)
-{
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-CosNaming_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dxn:c:l");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'l':
-        this->list_contents_ = 1;
-        break;
-      case 'x':
-        this->exit_later_++;
-        break;
-      case 'n':
-        this->resolve_name_ = 1;
-        this->name_to_resolve_ = get_opts.opt_arg ();
-        break;
-      case 'c':
-        this->resolve_name_ = 1;
-        this->context_to_resolve_ = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-x]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Execute client example code.
-
-int
-CosNaming_Client::run (void)
-{
-  // @@ TODO, add some interesting test here, maybe creating some
-  // nested naming contexts and registering a number of objreferences
-  // in there.  We could even use the iterators.
-
-  if (this->resolve_name_)
-    resolve_name (this->context_to_resolve_,
-                  this->name_to_resolve_);
-
-  if (this->list_contents_)
-    list_contents ();
-
-  return 0;
-}
-
-CosNaming_Client::~CosNaming_Client (void)
-{
-}
-
-int
-CosNaming_Client::resolve_name (char *c, char *n)
-{
-  TAO_TRY
-    {
-      CosNaming::Name name (2);
-      name.length (2);
-      name[0].id = CORBA::string_dup (c);
-      name[1].id = CORBA::string_dup (n);
-      CORBA::Object_var obj = this->my_name_client_->resolve (name,
-                                                              TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Could not resolve name in Naming service <%s>\n"),
-                          -1);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("init");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-void
-CosNaming_Client::list_contents (void)
-{
-  CosNaming::BindingIterator_var bi;
-  CosNaming::BindingList_var li;
-  CORBA::ULong how_many = 0;
-  CosNaming::Binding_var b;
-  CosNaming::Name n;
-  CORBA::ULong names = 0;
-
-  TAO_TRY
-    {
-      this->my_name_client_->list (how_many, li, bi, TAO_TRY_ENV);
-
-      while (bi->next_one (b, TAO_TRY_ENV))
-        {
-          n = b->binding_name;
-          names = n.length ();
-          ACE_DEBUG ((LM_DEBUG,
-                      " (%i) Name: ",
-                      names));
-
-          for (CORBA::ULong i = 0; i < names; i++)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s ",
-                        n[i].id._retn ()));
-
-          ACE_DEBUG ((LM_DEBUG, "type: %s\n",
-                      b->binding_type == CosNaming::ncontext ? "C" : "O"));
-        }
-    }
-  TAO_CATCHANY
-    {
-    }
-  TAO_ENDTRY;
-}
-
-int
-CosNaming_Client::init (int argc, char *argv[])
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  TAO_TRY
-    {
-      // Initialize ORB.
-      this->orb_ = CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Initialize the naming services
-      if (my_name_client_.init (orb_) != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize "
-			   "the TAO_Naming_Client. \n"),
-			  -1);
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  CosNaming_Client cosnaming_client;
-
-  if (cosnaming_client.init (argc, argv) == -1)
-    return 1;
-
-  return cosnaming_client.run ();
-}
diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.h b/TAO/orbsvcs/tests/Concurrency/NS_client.h
deleted file mode 100644
index 6c6407511e8..00000000000
--- a/TAO/orbsvcs/tests/Concurrency/NS_client.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    NS_client.h
-//
-// = DESCRIPTION
-//      This class tests the facilities to connect to the naming
-//      service and to resolve the name for the concurrency service client.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//      Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corba.h"
-#include "orbsvcs/orbsvcs/CosNamingC.h"
-
-class CosNaming_Client
-{
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the CosNaming
-  //    client example.  Provides a better understanding of the logic
-  //    in an object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing
-  //    the server is hidden in the class.  Just the run() interface
-  //    is needed.
-public:
-  // = Initialization and termination methods.
-  CosNaming_Client (void);
-  // Constructor.
-
-  ~CosNaming_Client (void);
-  // Destructor.
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int resolve_name(char *c, char *n);
-  // Resolves the name given on the command-line (-n option).
-
-  void list_contents(void);
-  // Lists the contents of the naming service.
-
-  CORBA::ORB_var orb_;
-  // Our ORB.
-
-  TAO_Naming_Client my_name_client_;
-  // And our Naming Client!
-
-  int list_contents_;
-  // Iterate through the naming service and list the contents.
-
-  int resolve_name_;
-  // Flag set by the -n option.
-
-  char *name_to_resolve_;
-  // Parameter given to the -n option.
-
-  char *context_to_resolve_;
-  // Parameter given to the -c option.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately.
-};
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
new file mode 100644
index 00000000000..90695b413b6
--- /dev/null
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
@@ -0,0 +1,66 @@
+project(Disconnect): orbsvcsexe, messaging {
+  depends  += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable
+  libs     += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Disconnect
+
+  Source_Files {
+    Disconnect.cpp
+  }
+}
+
+project(MT_Disconnect): orbsvcsexe, messaging {
+  depends  += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable
+  libs     += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = MT_Disconnect
+
+  Source_Files {
+    MT_Disconnect.cpp
+  }
+}
+
+project(Push_Event): orbsvcsexe, messaging {
+  depends  += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable
+  libs     += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Push_Event
+
+  Source_Files {
+    Push_Event.cpp
+  }
+}
+
+project(Pull_Push_Event): orbsvcsexe, messaging {
+  depends  += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable
+  libs     += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Pull_Push_Event
+
+  Source_Files {
+    Pull_Push_Event.cpp
+  }
+}
+
+project(Shutdown): orbsvcsexe, messaging {
+  depends  += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable
+  libs     += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Shutdown
+
+  Source_Files {
+    Shutdown.cpp
+  }
+}
+
+project(Random): orbsvcsexe, messaging {
+  depends  += "CosEvent Test Lib" CosEvent CosNaming Svc_Utils IORTable
+  libs     += CECTests TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Random
+
+  Source_Files {
+    Random.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
new file mode 100644
index 00000000000..90aead5a8fb
--- /dev/null
+++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
@@ -0,0 +1,10 @@
+project(CosEvent Test Lib): orbsvcslib {
+  sharedname = CECTests
+  depends   += CosEvent CosNaming Svc_Utils IORTable PortableServer
+  libs      += TAO_CosEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer
+  dllflags   = CEC_TEST_BUILD_DLL
+
+  Header_Files {
+    cectest_export.h
+  }
+}
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
new file mode 100644
index 00000000000..f57e45eed91
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -0,0 +1,22 @@
+project(ECM Supplier): rteventexe {
+  depends += RTSched CosNaming IORTable Messaging
+  libs    += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging
+  exename  = ECM_Supplier
+
+  Source_Files {
+    ECM_Data.cpp
+    ECM_Supplier.cpp
+  }
+}
+
+project(ECM Consumer): rteventexe {
+  depends += RTSched CosNaming IORTable Messaging
+  libs    += TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging
+  exename  = ECM_Consumer
+
+  Source_Files {
+    ECM_Data.cpp
+    ECM_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
new file mode 100644
index 00000000000..e28a97a6e44
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
@@ -0,0 +1,5 @@
+project: rteventexe {
+  depends += Messaging
+  libs    += TAO_Messaging
+  exename  = EC_Mcast
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
new file mode 100644
index 00000000000..9edd85ae9e9
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
@@ -0,0 +1,5 @@
+project: rteventexe {
+  depends += RTOLDEvent RTSchedEvent RTSched CosNaming IORTable Messaging
+  libs    += TAO_RTOLDEvent TAO_RTSchedEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging
+  exename  = EC_Multiple
+}
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
new file mode 100644
index 00000000000..6c565916946
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -0,0 +1,36 @@
+project(ECT Supplier): rteventexe {
+  depends += RTOLDEvent RTSched CosNaming IORTable Messaging
+  libs    += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging
+  exename  = ECT_Supplier
+
+  Source_Files {
+    ECT_Driver.cpp
+    ECT_Supplier_Driver.cpp
+    ECT_Supplier.cpp
+  }
+}
+
+project(ECT Consumer): rteventexe {
+  depends += RTOLDEvent RTSched CosNaming IORTable Messaging
+  libs    += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging
+  exename  = ECT_Consumer
+
+  Source_Files {
+    ECT_Driver.cpp
+    ECT_Consumer_Driver.cpp
+    ECT_Consumer.cpp
+  }
+}
+
+project(ECT Throughput): rteventexe {
+  depends += RTOLDEvent RTSched CosNaming IORTable Messaging
+  libs    += TAO_RTOLDEvent TAO_RTSched TAO_CosNaming TAO_IORTable TAO_Messaging
+  exename  = ECT_Throughput
+
+  Source_Files {
+    ECT_Driver.cpp
+    ECT_Consumer.cpp
+    ECT_Supplier.cpp
+    ECT_Throughput.cpp
+  }
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
new file mode 100644
index 00000000000..eae39280a71
--- /dev/null
+++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
@@ -0,0 +1,165 @@
+project(Reconnect): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Reconnect
+
+  Source_Files {
+    Reconnect.cpp
+  }
+}
+
+project(Shutdown): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Shutdown
+
+  Source_Files {
+    Shutdown.cpp
+  }
+}
+
+project(Observer): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Observer
+
+  Source_Files {
+    Observer.cpp
+  }
+}
+
+project(BCast): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = BCast
+
+  Source_Files {
+    BCast.cpp
+  }
+}
+
+project(Timeout): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Timeout
+
+  Source_Files {
+    Timeout.cpp
+  }
+}
+
+project(Wildcard): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Wildcard
+
+  Source_Files {
+    Wildcard.cpp
+  }
+}
+
+project(Negation): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Negation
+
+  Source_Files {
+    Negation.cpp
+  }
+}
+
+project(Disconnect): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Disconnect
+
+  Source_Files {
+    Disconnect.cpp
+  }
+}
+
+project(MT_Disconnect): orbsvcsexe, messaging {
+  depends  += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = MT_Disconnect
+
+  Source_Files {
+    MT_Disconnect.cpp
+  }
+}
+
+project(Atomic_Reconnect): orbsvcsexe, messaging {
+  depends  += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Atomic_Reconnect
+
+  Source_Files {
+    Atomic_Reconnect.cpp
+  }
+}
+
+project(Bitmask): orbsvcsexe, messaging {
+  depends  += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Bitmask
+
+  Source_Files {
+    Bitmask.cpp
+  }
+}
+
+project(Complex): orbsvcsexe, messaging {
+  depends  += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Complex
+
+  Source_Files {
+    Complex.cpp
+  }
+}
+
+project(Gateway): orbsvcsexe, messaging {
+  depends  += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Gateway
+
+  Source_Files {
+    Gateway.cpp
+  }
+}
+
+project(Control): orbsvcsexe, messaging {
+  depends  += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Control
+
+  Source_Files {
+    Control.cpp
+  }
+}
+
+project(Random): orbsvcsexe, messaging {
+  depends  += "RTEvent Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Random
+
+  Source_Files {
+    Random.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
new file mode 100644
index 00000000000..647ba0c8c91
--- /dev/null
+++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
@@ -0,0 +1,55 @@
+project(Throughput): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Throughput
+
+  Source_Files {
+    Throughput.cpp
+  }
+}
+
+project(Connect): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Connect
+
+  Source_Files {
+    Connect.cpp
+  }
+}
+
+project(Inversion): orbsvcsexe, messaging {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Inversion
+
+  Source_Files {
+    Inversion.cpp
+  }
+}
+
+project(Latency): orbsvcsexe, messaging, strategies {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Latency
+
+  Source_Files {
+    Latency.cpp
+  }
+}
+
+project(Latency_Server): orbsvcsexe, messaging, strategies {
+  depends  += "Event Test Lib" RTEvent CosNaming Svc_Utils IORTable
+  libs     += ECTests TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable
+  includes += ../lib
+  exename   = Latency_Server
+
+  Source_Files {
+    Latency_Server.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
new file mode 100644
index 00000000000..57cd7116b69
--- /dev/null
+++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
@@ -0,0 +1,10 @@
+project(Event Test Lib): orbsvcslib {
+  sharedname = ECTests
+  depends   += RTEvent CosNaming Svc_Utils IORTable PortableServer
+  libs      += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer
+  dllflags   = EC_TEST_BUILD_DLL
+
+  Header_Files {
+    ectest_export.h
+  }
+}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
new file mode 100644
index 00000000000..d50500423ad
--- /dev/null
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
@@ -0,0 +1,21 @@
+project: server, orbsvcsexe {
+  depends += FTORB IORManip
+  libs    += TAO_FTORB TAO_IORManip
+
+  Source_Files {
+    test_i.cpp
+    server.cpp
+  }
+}
+
+project(Manager): server, orbsvcsexe {
+  depends += FTORB IORManip
+  libs    += TAO_FTORB TAO_IORManip
+  exename  = Manager
+
+  Source_Files {
+    testC.cpp
+    Manager.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
new file mode 100644
index 00000000000..d7f22d77b16
--- /dev/null
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
@@ -0,0 +1,5 @@
+project(IOGRTest): server, orbsvcsexe {
+  depends += FTORB IORManip
+  libs    += TAO_FTORB TAO_IORManip
+  exename  = IOGRTest
+}
diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
new file mode 100644
index 00000000000..4495317318e
--- /dev/null
+++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
@@ -0,0 +1,19 @@
+project: namingexe {
+  Source_Files {
+    server_i.cpp
+    MCast_Server_i.cpp
+    server.cpp
+  }
+}
+
+project(client): namingexe {
+  exename = client
+
+  Source_Files {
+    ior_mcast_client_i.cpp
+    server_i.cpp
+    MCast_Server_i.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
new file mode 100644
index 00000000000..e8c53b5d38d
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -0,0 +1,70 @@
+project(airplane server) : server, orbsvcsexe {
+  depends += IORTable
+  libs    += TAO_IORTable
+  exename  = airplane_server
+
+  IDL_Files {
+    Airplane.idl
+  }
+
+  Source_Files {
+    AirplaneC.cpp
+    AirplaneS.cpp
+    airplane_i.cpp
+    airplane_server_i.cpp
+    airplane_server.cpp
+  }
+}
+
+project(airplane client) : server, orbsvcsexe {
+  depends += IORTable
+  libs    += TAO_IORTable
+  exename  = airplane_client
+
+  IDL_Files {
+    Airplane.idl
+  }
+
+  Source_Files {
+    AirplaneC.cpp
+    AirplaneS.cpp
+    airplane_client_i.cpp
+    airplane_client.cpp
+  }
+}
+
+project(nestea server) : server, orbsvcsexe {
+  depends += IORTable
+  libs    += TAO_IORTable
+  exename  = nestea_server
+
+  IDL_Files {
+    Nestea.idl
+  }
+
+  Source_Files {
+    NesteaC.cpp
+    NesteaS.cpp
+    nestea_i.cpp
+    nestea_server_i.cpp
+    nestea_server.cpp
+  }
+}
+
+project(nestea client) : server, orbsvcsexe {
+  depends += IORTable
+  libs    += TAO_IORTable
+  exename  = nestea_client
+
+  IDL_Files {
+    Nestea.idl
+  }
+
+  Source_Files {
+    NesteaC.cpp
+    NesteaS.cpp
+    nestea_client_i.cpp
+    nestea_client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
new file mode 100644
index 00000000000..7e7367b39be
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
@@ -0,0 +1,4 @@
+project(ImplRepo NameService) : namingexe {
+  exename  = test
+}
+
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
new file mode 100644
index 00000000000..8a641176f7e
--- /dev/null
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
@@ -0,0 +1,22 @@
+project: server {
+  depends += IFR_Client
+  libs    += TAO_IFR_Client
+
+  Source_Files {
+    test_i.cpp
+    server.cpp
+  }
+}
+
+project(client): server {
+  depends += IFR_Client DynamicInterface
+  libs    += TAO_IFR_Client TAO_DynamicInterface
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    ifr_dii_client.cpp
+    client.cpp
+  }
+}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc
new file mode 100644
index 00000000000..247e13d8593
--- /dev/null
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc
@@ -0,0 +1,5 @@
+project(InterfaceRepo IFR Test): taoexe {
+  depends += IFR_Client
+  libs    += TAO_IFR_Client
+  exename  = IFR_Test
+}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc
new file mode 100644
index 00000000000..6e421a842a0
--- /dev/null
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc
@@ -0,0 +1,5 @@
+project(InterfaceRepo Persistence Test): taoexe {
+  depends += IFR_Client
+  libs    += TAO_IFR_Client
+  exename  = Persistence_Test
+}
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
new file mode 100644
index 00000000000..8ab0054fcdd
--- /dev/null
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
@@ -0,0 +1,3 @@
+project(Interoperable Naming): namingexe {
+  exename = client
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc
new file mode 100644
index 00000000000..71b2d35bfe5
--- /dev/null
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadBalancing.mpc
@@ -0,0 +1,22 @@
+project: server, orbsvcsexe {
+  depends += LoadBalancing
+  libs    += TAO_LoadBalancing
+
+  Source_Files {
+    Hash_ReplicaControl.cpp
+    Hash_Replica_i.cpp
+    server.cpp
+  }
+}
+
+project(client): server, orbsvcsexe {
+  depends += LoadBalancing
+  libs    += TAO_LoadBalancing
+  exename  = client
+
+  Source_Files {
+    Hash_ReplicaC.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
new file mode 100644
index 00000000000..2ad4d82a178
--- /dev/null
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
@@ -0,0 +1,14 @@
+project: server {
+  Source_Files {
+    McastHello.cpp
+    server.cpp
+  }
+}
+
+project: client {
+  Source_Files {
+    TestC.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
new file mode 100644
index 00000000000..8a9b37f4cee
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
@@ -0,0 +1,19 @@
+project(Structured Supplier): notifytest {
+  exename = Structured_Supplier
+
+  Source_Files {
+    Structured_Supplier.cpp
+  }
+}
+
+project(Structured Consumer): notifytest {
+  exename = Structured_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Structured_Push_Consumer.cpp
+    Structured_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
new file mode 100644
index 00000000000..737753c82e1
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -0,0 +1,38 @@
+project(Structured Supplier): notifytest {
+  exename = Structured_Supplier
+
+  Source_Files {
+    Structured_Supplier.cpp
+  }
+}
+
+project(Structured Consumer): notifytest {
+  exename = Structured_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Structured_Push_Consumer.cpp
+    Structured_Consumer.cpp
+  }
+}
+
+project(Sequence Supplier): notifytest {
+  exename = Sequence_Supplier
+
+  Source_Files {
+    Sequence_Supplier.cpp
+  }
+}
+
+project(Sequence Consumer): notifytest {
+  exename = Sequence_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Sequence_Push_Consumer.cpp
+    Sequence_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
new file mode 100644
index 00000000000..fc4556e54d0
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
@@ -0,0 +1,18 @@
+project(Structured Supplier): notifytest {
+  exename = Structured_Supplier
+
+  Source_Files {
+    Structured_Supplier.cpp
+  }
+}
+
+project(Structured Consumer): notifytest {
+  exename = Structured_Consumer
+
+  Source_Files {
+    goC.cpp
+    Notify_Structured_Push_Consumer.cpp
+    Structured_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
new file mode 100644
index 00000000000..737753c82e1
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
@@ -0,0 +1,38 @@
+project(Structured Supplier): notifytest {
+  exename = Structured_Supplier
+
+  Source_Files {
+    Structured_Supplier.cpp
+  }
+}
+
+project(Structured Consumer): notifytest {
+  exename = Structured_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Structured_Push_Consumer.cpp
+    Structured_Consumer.cpp
+  }
+}
+
+project(Sequence Supplier): notifytest {
+  exename = Sequence_Supplier
+
+  Source_Files {
+    Sequence_Supplier.cpp
+  }
+}
+
+project(Sequence Consumer): notifytest {
+  exename = Sequence_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Sequence_Push_Consumer.cpp
+    Sequence_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequenc_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequenc_Multi_ETCL_Filter.mpc
new file mode 100644
index 00000000000..a0d6a42a016
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequenc_Multi_ETCL_Filter.mpc
@@ -0,0 +1,19 @@
+project(Sequence Supplier): notifytest {
+  exename = Sequence_Supplier
+
+  Source_Files {
+    Sequence_Supplier.cpp
+  }
+}
+
+project(Sequence Consumer): notifytest {
+  exename = Sequence_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Sequence_Push_Consumer.cpp
+    Sequence_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc
new file mode 100644
index 00000000000..a0d6a42a016
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Multi_Filter.mpc
@@ -0,0 +1,19 @@
+project(Sequence Supplier): notifytest {
+  exename = Sequence_Supplier
+
+  Source_Files {
+    Sequence_Supplier.cpp
+  }
+}
+
+project(Sequence Consumer): notifytest {
+  exename = Sequence_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Sequence_Push_Consumer.cpp
+    Sequence_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
new file mode 100644
index 00000000000..bc010fa07a2
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter.mpc
@@ -0,0 +1,18 @@
+project(Structured Supplier): notifytest {
+  exename = Structured_Supplier
+
+  Source_Files {
+    Structured_Supplier.cpp
+  }
+}
+
+project(Structured Consumer): notifytest {
+  exename = Structured_Consumer
+
+  Source_Files {
+    controlC.cpp
+    Notify_Push_Consumer.cpp
+    Structured_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
new file mode 100644
index 00000000000..90b199f6874
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Multi_Filter.mpc
@@ -0,0 +1,19 @@
+project(Structured Supplier): notifytest {
+  exename = Structured_Supplier
+
+  Source_Files {
+    Notify_Push_Supplier.cpp
+    Structured_Supplier.cpp
+  }
+}
+
+project(Structured Consumer): notifytest {
+  exename = Structured_Consumer
+
+  Source_Files {
+    controlC.cpp
+    Notify_Push_Consumer.cpp
+    Structured_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
new file mode 100644
index 00000000000..e73f58d7c19
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -0,0 +1,3 @@
+project(Notify Lib): orbsvcslib, notify {
+  sharedname = NotifyTests  
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
new file mode 100644
index 00000000000..737753c82e1
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -0,0 +1,38 @@
+project(Structured Supplier): notifytest {
+  exename = Structured_Supplier
+
+  Source_Files {
+    Structured_Supplier.cpp
+  }
+}
+
+project(Structured Consumer): notifytest {
+  exename = Structured_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Structured_Push_Consumer.cpp
+    Structured_Consumer.cpp
+  }
+}
+
+project(Sequence Supplier): notifytest {
+  exename = Sequence_Supplier
+
+  Source_Files {
+    Sequence_Supplier.cpp
+  }
+}
+
+project(Sequence Consumer): notifytest {
+  exename = Sequence_Consumer
+
+  Source_Files {
+    goC.cpp
+    common.cpp
+    Notify_Sequence_Push_Consumer.cpp
+    Sequence_Consumer.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
new file mode 100644
index 00000000000..71a8b8973df
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
@@ -0,0 +1,3 @@
+project(RedGreen): notifytest {
+  exename = RedGreen_Test
+}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
new file mode 100644
index 00000000000..3279c094b0b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -0,0 +1,5 @@
+project(Throughput): notifytest, strategies {
+  depends += Messaging
+  libs    += TAO_Messaging
+  exename  = Throughput
+}
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
new file mode 100644
index 00000000000..7b728e9c800
--- /dev/null
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -0,0 +1,19 @@
+project: server, namingexe {
+  depends += CosProperty
+  libs    += TAO_CosProperty
+
+  Source_Files {
+    server.cpp
+  }
+}
+
+project(client): server, namingexe {
+  depends += CosProperty
+  libs    += TAO_CosProperty
+  exename  = client
+
+  Source_Files {
+    server.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
index 6db75fdfd4e..9a97aba8c46 100644
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Strategy_Scheduler.h"
+#include "orbsvcs/Sched/Strategy_Scheduler.h"
 #include "orbsvcs/Time_Utilities.h"
 #if defined (ACE_HAS_QUANTIFY)
 # include <quantify.h>
diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc
new file mode 100644
index 00000000000..dae839dfb5d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Sched/Sched.mpc
@@ -0,0 +1,5 @@
+project(Sched): server, namingexe {
+  depends += RTSched
+  libs    += TAO_RTSched
+  exename  = Sched
+}
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
new file mode 100644
index 00000000000..422c31af14b
--- /dev/null
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
@@ -0,0 +1,9 @@
+project(Sched Conf): server, namingexe {
+  depends += RTSched
+  libs    += TAO_RTSched
+  exename  = Sched_Conf
+
+  Source_Files {
+    Sched_Conf.cpp
+  }
+}
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
new file mode 100644
index 00000000000..893b749f09d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -0,0 +1,14 @@
+project: server {
+  Source_Files {
+    TX_Object_i.cpp
+    server.cpp
+  }
+}
+
+project: client {
+  Source_Files {
+    TX_ObjectC.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
new file mode 100644
index 00000000000..5ca22ac8b3e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
@@ -0,0 +1,32 @@
+project: server {
+  IDL_Files {
+    server.idl
+    client.idl
+  }
+
+  Source_Files {
+    clientC.cpp
+    serverC.cpp
+    serverS.cpp
+    server_i.cpp
+    server.cpp
+  }
+}
+
+project(client): server {
+  exename = client
+
+  IDL_Files {
+    server.idl
+    client.idl
+  }
+
+  Source_Files {
+    clientC.cpp
+    clientS.cpp
+    serverC.cpp
+    client_i.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
new file mode 100644
index 00000000000..36887871fbb
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
@@ -0,0 +1,16 @@
+project: server {
+  Source_Files {
+    Server_Worker.cpp
+    test_i.cpp
+    server.cpp
+  }
+}
+
+project: client {
+  Source_Files {
+    testC.cpp
+    Client_Worker.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
new file mode 100644
index 00000000000..ff315dc282d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -0,0 +1,20 @@
+project: server, orbsvcsexe {
+  ssl      = 1
+  depends += Security
+  libs    += TAO_Security
+  Source_Files {
+    Foo_i.cpp
+    server.cpp
+  }
+}
+
+project: client, orbsvcsexe {
+  depends += Security
+  libs    += TAO_Security
+
+  Source_Files {
+    FooC.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
new file mode 100644
index 00000000000..311f7bf8dc2
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SecurityLevel1.mpc
@@ -0,0 +1,20 @@
+project: server, orbsvcsexe {
+  ssl      = 1
+  depends += Security
+  libs    += TAO_Security
+  Source_Files {
+    SLevel1_Test_i.cpp
+    server.cpp
+  }
+}
+
+project: client, orbsvcsexe {
+  depends += Security
+  libs    += TAO_Security
+
+  Source_Files {
+    SLevel1_TestC.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
new file mode 100644
index 00000000000..d07f779cc80
--- /dev/null
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -0,0 +1,10 @@
+project(Simple Naming Client) : orbsvcsexe {
+  depends += CosNaming Svc_Utils IORTable PortableServer
+  exename  = client
+  libs    += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_PortableServer
+
+  Source_Files {
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc
new file mode 100644
index 00000000000..70469bedde0
--- /dev/null
+++ b/TAO/orbsvcs/tests/Time/Time.mpc
@@ -0,0 +1,5 @@
+project(client): server, namingexe {
+  depends += CosTime
+  libs    += TAO_CosTime
+  exename  = client
+}
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
new file mode 100644
index 00000000000..1cd5f5c457c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -0,0 +1,53 @@
+project(Trading Test Lib): orbsvcslib {
+  depends   += CosTrading CosNaming Svc_Utils IORTable DynamicAny PortableServer TAO
+  libs      += TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_DynamicAny TAO_PortableServer TAO
+  sharedname = TTest
+
+  Source_Files {
+    TT_Info.cpp
+    Service_Type_Exporter.cpp
+    Offer_Exporter.cpp
+    Offer_Importer.cpp
+    Simple_Dynamic.cpp
+  }
+}
+
+project(export test): namingexe {
+  depends += "Trading Test Lib" CosTrading DynamicAny
+  libs    += TTest TAO_CosTrading TAO_DynamicAny
+  exename  = export_test
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    export_test.cpp
+  }
+}
+
+project(import test): namingexe {
+  depends += "Trading Test Lib" CosTrading DynamicAny
+  libs    += TTest TAO_CosTrading TAO_DynamicAny
+  exename  = import_test
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    import_test.cpp
+  }
+}
+
+project(colocated test): namingexe {
+  depends += "Trading Test Lib" CosTrading DynamicAny
+  libs    += TTest TAO_CosTrading TAO_DynamicAny
+  exename  = colocated_test
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    colocated_test.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
new file mode 100644
index 00000000000..d30a93ca5f5
--- /dev/null
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
@@ -0,0 +1,20 @@
+project: namingexe {
+  depends += CosNaming
+  libs    += TAO_CosNaming
+
+  Source_Files {
+    status_i.cpp
+    server.cpp
+  }
+}
+
+project(client): namingexe {
+  exename = client
+
+  Source_Files {
+    status_i.cpp
+    ior_corbaname_client_i.cpp
+    client.cpp
+  }
+}
+
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
new file mode 100644
index 00000000000..a8f87249a81
--- /dev/null
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
@@ -0,0 +1,3 @@
+project(tests svc loader): taoexe {
+  exename = tests_svc_loader
+}
\ No newline at end of file