ChangeLogTag:Wed Dec 10 09:23:35 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

24 files changed, 74 insertions, 20 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6ce57db208d..d98a663e840 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,30 @@
+Wed Dec 10 09:23:35 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+	* examples/POA/DSI/POA_DSI.mpc:
+	* examples/POA/Default_Servant/POA_Default_Servant.mpc:
+	* examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+	* examples/POA/FindPOA/POA_FindPOA.mpc:
+	* examples/POA/Forwarding/POA_Forwarding.mpc:
+	* examples/POA/Generic_Servant/POA_Generic_Servant.mpc:
+	* examples/POA/Loader/POA_Loader.mpc:
+	* examples/POA/NewPOA/POA_NewPOA.mpc:
+	* examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+	* examples/POA/POA_BiDir/POA_BiDir.mpc:
+	* examples/POA/TIE/POA_TIE.mpc:
+	* orbsvcs/tests/Bug_1630_Regression/test.mpc:
+	* tests/AMI_Buffering/client.cpp:
+	* tests/Bug_1639_Regression/Makefile
+	* tests/Bug_1639_Regression/Makefile.Bug_1639_testclient:
+	* tests/POA/Identity/Identity.mpc
+	* tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
+	* tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc:
+	* tests/RTCORBA/Policies/Policies.mpc:
+	* tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
+	* tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
+	* tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
+	* tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
+
 Wed Dec 10 16:58:08 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/GIOP_Message_State.cpp:
@@ -527,7 +554,6 @@ Wed Feb 26 21:44:34 2003  Chris Cleeland  <cleeland_c@ociweb.com>
           Changes that don't appear to be related in any way to PMB...
 
 ----------------------------------------
-
 Wed Dec 10 15:12:34 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp:
@@ -769,17 +795,10 @@ Mon Dec  8 19:33:03 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
         * tao/Synch_Invocation.cpp:
 
-<<<<<<< ChangeLog
 	  Fixed a minor problem with reinvocation. We were not handling
 	  errors properly, more precisely the restart errors if they show
 	  up during wait_for_reply (). Thanks to Milan Cvetkovic for
 	  motivating this change.
-=======
-          Fixed a minor problem with reinvocation. We were not handling
-          errors properly, more precisely the retsrat errors if they show
-          up during wait_for_reply (). Thanks to Milan Cvetkovic for
-          motivating this change.
->>>>>>> 1.3209
 
         * tao/Messaging/Asynch_Invocation.cpp:
 
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 4af0d416116..bacc4c27c79 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,4 +1,5 @@
 project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 836b8dcadeb..1133101194b 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,4 +1,5 @@
 project(*Client) : taoexe, messaging, portableserver {
+  avoids += minimum_corba
   source_files {
     client.cpp
   }
@@ -9,4 +10,4 @@ project(*Server) : taoexe, messaging, portableserver, dynamicinterface {
     Database_i.cpp
     server.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 6c5ebe73de9..ef0f4642ffc 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,12 +1,14 @@
 project(*Client) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     client.cpp
   }
 }
 
 project(*Server) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     File_i.cpp
     server.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 4af0d416116..bacc4c27c79 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -1,4 +1,5 @@
 project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
index 50c37f6f1e7..21e29385c4e 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,3 +1,4 @@
 project: taoexe, portableserver {
+  avoids += minimum_corba
 }
 
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
index 191db373ef8..0abc3de7a4d 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -1,10 +1,12 @@
 project(*Client) : taoexe, portableserver {
+  avoids += minimum_corba
   source_files {
     client.cpp
   }
 }
 
 project(*Server) : taoexe, portableserver {
+  avoids += minimum_corba
   includes += ../Generic_Servant
   libs += Generic_Servant
   after += POA_Generic_Servant_Lib
@@ -13,4 +15,4 @@ project(*Server) : taoexe, portableserver {
     server.cpp
     Servant_Activator.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
index 937bee19aaa..3fce3e7f2ab 100644
--- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -1,4 +1,6 @@
+// $Id$
 project(*lib): taolib_with_idl, portableserver {
+  avoids += minimum_corba
   sharedname = Generic_Servant
   dynamicflags = GENERIC_SERVANT_BUILD_DLL
   idlflags += -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
@@ -15,4 +17,4 @@ project(*client): taoexe, portableserver {
   Source_Files {
     client.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index ce613af3ebf..08d63c26e51 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,4 +1,6 @@
+// $Id$
 project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
index 5f4f6d3d49c..de7282249a6 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,2 +1,4 @@
+//$Id$
 project : taoexe, portableserver {
+	avoids += minimum_corba
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index eb5f6a47137..29f1da6ddf2 100644
--- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -1,4 +1,5 @@
 project(*Server): taoexe, portableserver {
+   avoids += minimum_corba
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
index 8a1e41e1aac..e28131acdc2 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,3 +1,5 @@
 project: taoexe, portableserver, bidir_giop {
+	
+	avoids += minimum_corba
 }
 
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
index 1fad2772df5..68654880054 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -1,4 +1,5 @@
 project(*Client) : taoexe, portableserver {
+  requires += minimum_corba
   idlflags -= -Sc
   source_files {
     client.cpp
@@ -12,4 +13,4 @@ project(*Server) : taoexe, portableserver {
     test_i.cpp
     server.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index 116a274b7cc..69a75b6fa55 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -1,2 +1,3 @@
 project : orbsvcsexe, notify, naming {
+  avoids += minimum_corba
 }
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
index 7db8c9d00e4..acfa401f405 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
@@ -2,10 +2,11 @@ project(Bug_1630_testclient ) : client {
    exename = testclient
    libs += TAO_IFR_Client
    libpaths += $(TAO_ROOT)/tao/IFR_Client $(TAO_ROOT)/tao $(ACE_ROOT)/ace
+   avoids += minimum_corba
 
    IDL_Files {
    }
    Source_Files {
       testclient.cpp
    }
-}
\ No newline at end of file
+}
diff --git a/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient b/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient
index 7acd995a1d0..8c8c189a5c7 100644
--- a/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient
+++ b/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient
@@ -32,7 +32,7 @@ FILES = \
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
-LDLIBS = -lTAO_PortableServer -lTAO_DynamicAny -lTAO -lACE
+LDLIBS = -lTAO_DynamicAny -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO -lACE
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 ## We don't need the ACELIB setting from wrapper_macros.GNU
 ACELIB =
@@ -75,7 +75,7 @@ all: idl_stubs
 
 # This rule forces make to run the idl_stubs
 # target before building any of the source files.
-struct_client.cpp structC.cpp structS.cpp: idl_stubs
+FORCED_IDL_STUBS = struct_client.cpp structC.cpp structS.cpp
 endif
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
@@ -88,14 +88,14 @@ include $(TAO_ROOT)/taoconfig.mk
 CPPFLAGS     += -I../../../include -I. -I../.. -I../../tao -I../../..
 ifeq ($(static_libs),1)
   ifneq ($(LIB),)
-    CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
+    CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
   endif
 endif
 
 
-LDFLAGS      += -L../../../ace -L. -L../../tao/PortableServer -L../../tao/DynamicAny -L../../tao -L../../../lib
+LDFLAGS      += -L../../../lib
 
-TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
+TAO_IDLFLAGS += -Gv -I../.. -I../../tao -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
@@ -104,13 +104,16 @@ require_warning:
 	@echo exceptions
 
 
-ADDITIONAL_IDL_TARGETS =
 # IDL File Directory: .
 
 ifneq ($(ADDITIONAL_IDL_TARGETS),)
 idl_stubs: $(ADDITIONAL_IDL_TARGETS)
 endif
 
+ifneq ($(FORCED_IDL_STUBS),)
+$(FORCED_IDL_STUBS): idl_stubs
+endif
+
 .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext)))
 
 ifndef kylix
diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc
index 462f32a40ae..0d98e6a8215 100644
--- a/TAO/tests/POA/Identity/Identity.mpc
+++ b/TAO/tests/POA/Identity/Identity.mpc
@@ -1,2 +1,3 @@
 project(POA*): taoexe, portableserver {
+	avoids += minimum_corba
 }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index f45d8c78609..f668d24e8f7 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -1,10 +1,12 @@
 project(*Server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
 project(*Client): rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc
index 0aee233bb3a..31e74cfc0be 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Protocol_Priority.mpc
@@ -1,10 +1,12 @@
 project(*Server): strategies, rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
 project(*Client): strategies, rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc
index fa3be0d5055..cefd7085caa 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.mpc
+++ b/TAO/tests/RTCORBA/Policies/Policies.mpc
@@ -1,2 +1,3 @@
 project(RTCORBA Policies Server): rt_server {
+  avoids += minimum_corba
 }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index f45d8c78609..f75698b3397 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -1,4 +1,5 @@
 project(*Server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index f45d8c78609..f668d24e8f7 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -1,10 +1,12 @@
 project(*Server): rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
 project(*Client): rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 0aee233bb3a..31e74cfc0be 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -1,10 +1,12 @@
 project(*Server): strategies, rt_server {
+  avoids += minimum_corba
   Source_Files {
     server.cpp
   }
 }
 
 project(*Client): strategies, rt_client {
+  avoids += minimum_corba
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index a3206c05ae6..2dd8ebe099c 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -1,4 +1,5 @@
 project(*Server): strategies, rt_server {
+  avoid += minimum_corba
   Source_Files {
     test_i.cpp
     server.cpp