ChangeLog tag: Thu Nov 4 22:20:19 2004 Phil Mesnier <mesnier_p@ociweb.com>

6 files changed, 26 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 51424b1034b..fd82f917183 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Thu Nov  4 22:20:19 2004  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * TAO/TAOACE.mwc:
+          Added ../protocols, a new directory, to the workspace
+          definition. See my comment in $ACE_ROOT/ChangeLog, Thu Nov  4
+          22:08:40 2004  for details regarding the protocols directory.
+
+        * TAO/orbsvcs/orbsvcs/HTIOP.mpc:
+          This project was not including htbp as a base.
+
+        * TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc:
+        * TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
+        * TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc:
+          Removed HTIOP as a base project since these tests all load HTIOP
+          dynamically.
+
 Thu Nov  4 17:42:07 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* orbsvcs/orbsvcs/Log/PersistStore.cpp:
diff --git a/TAO/TAOACE.mwc b/TAO/TAOACE.mwc
index 35c4ffa7986..fb474870d76 100644
--- a/TAO/TAOACE.mwc
+++ b/TAO/TAOACE.mwc
@@ -8,6 +8,7 @@ workspace {
   ../ACEXML/parser/parser
   ../ACEXML/apps/svcconf
   ../Kokyu/Kokyu.mpc
+  ../protocols/ace/HTBP
   tao
   TAO_IDL
   utils
@@ -16,5 +17,5 @@ workspace {
     orbsvcs/tests
     orbsvcs/performance-tests
     orbsvcs/examples
-  }  
+  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
index 62390b4ab0a..7db3241bbed 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
@@ -2,9 +2,8 @@
 //
 // $Id$
 
-project : orbsvcslib, core {
+project : htbp, orbsvcslib, core {
   sharedname   = TAO_HTIOP
-  libs += ACE_HTBP
   idlflags    += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h
   dynamicflags = HTIOP_BUILD_DLL
   tagchecks += HTIOP
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
index 10e1fff82cb..aa9cee0c125 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver, ami, htiop {
+project(*Server): messaging, taoexe, portableserver, ami {
   Source_Files {
     Test_Output.cpp
     ami_test_i.cpp
@@ -10,14 +10,14 @@ project(*Server): messaging, taoexe, portableserver, ami, htiop {
   }
 }
 
-project(*Client): messaging, taoexe, portableserver, ami, htiop {
+project(*Client): messaging, taoexe, portableserver, ami {
   Source_Files {
     Test_Output.cpp
     client.cpp
   }
 }
 
-project(*Simple Client): messaging, taoexe, portableserver, ami, htiop {
+project(*Simple Client): messaging, taoexe, portableserver, ami {
   Source_Files {
     Test_Output.cpp
     simple_client.cpp
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
index 6398b359fc1..d14b6e2b0f6 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(*Server): taoexe, portableserver, bidir_giop, htiop {
+project(*Server): taoexe, portableserver, bidir_giop {
   IDL_Files {
     test.idl
   }
@@ -15,7 +15,7 @@ project(*Server): taoexe, portableserver, bidir_giop, htiop {
   }
 }
 
-project(*Client): taoexe, portableserver, minimum_corba, bidir_giop, htiop {
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
   IDL_Files {
     test.idl
   }
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
index 131c2449182..bc4774350c6 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(*Server): taoexe, naming, iortable, portableserver, htiop {
+project(*Server): taoexe, naming, iortable, portableserver {
   Source_Files {
     Test_Output.cpp
     TestS.cpp
@@ -15,7 +15,7 @@ project(*Server): taoexe, naming, iortable, portableserver, htiop {
   }
 }
 
-project(*Client): taoexe, htiop {
+project(*Client): taoexe {
 
   Source_Files {
     Test_Output.cpp