ChangeLogTag:Sat Feb 22 08:52:13 2003 Ossama Othman <ossama@uci.edu>

3 files changed, 36 insertions, 27 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 96aa310e534..7aed662d168 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Sat Feb 22 08:52:13 2003  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
+
+	  Include "tao/Wait_Strategy.h".  Necessitated by inter-header
+	  dependency reductions.
+
 Sat Feb 22 08:44:46 2003  Ossama Othman  <ossama@uci.edu>
 
 	* tests/Queued_Message_Test/Queued_Message_Test.cpp:
@@ -36,7 +43,7 @@ Fri Feb 21 13:40:41 2003  Ossama Othman  <ossama@uci.edu>
 Fri Feb 21 13:07:33 2003  Ossama Othman  <ossama@uci.edu>
 
 	* TAO_IDL/be/be_interface.cpp (gen_stub_ctor):
-	* TAO_IDL/be/be_visitor_exception/exception_cs.cpp (visit_exception): 
+	* TAO_IDL/be/be_visitor_exception/exception_cs.cpp (visit_exception):
 	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp (visit_interface):
 
 	  Generate code that uses the ACE_NESTED_CLASS macro to work
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
index b8284a82d67..fbc18c5a934 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
+++ b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
@@ -289,7 +289,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -398,6 +397,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
   SSLIOP/SSLIOP_Current.h SSLIOP/SSLIOP_Current_Impl.h \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -689,7 +689,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -798,6 +797,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
   SSLIOP/SSLIOP_Current.h SSLIOP/SSLIOP_Current_Impl.h \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -1064,7 +1064,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -1083,6 +1082,7 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -1422,7 +1422,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -1531,6 +1530,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
   SSLIOP/SSLIOP_Current.h SSLIOP/SSLIOP_Current_Impl.h \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -1643,7 +1643,9 @@ realclean: clean
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/Connect_Strategy.h
+  $(TAO_ROOT)/tao/Connect_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.h \
+  $(TAO_ROOT)/tao/Wait_Strategy.inl
 
 .obj/SSLIOP_Credentials.o .obj/SSLIOP_Credentials.so .shobj/SSLIOP_Credentials.o .shobj/SSLIOP_Credentials.so: SSLIOP/SSLIOP_Credentials.cpp \
   SSLIOP/SSLIOP_Credentials.h $(ACE_ROOT)/ace/pre.h \
@@ -1827,7 +1829,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Security/security_export.h \
+  SSLIOP/SSLIOP_Export.h \
   SecurityLevel1C.h \
   SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2033,7 +2035,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Security/security_export.h \
+  SSLIOP/SSLIOP_Export.h \
   SecurityLevel1C.h \
   SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2239,7 +2241,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Security/security_export.h \
+  SSLIOP/SSLIOP_Export.h \
   SecurityLevel1C.h \
   SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2445,6 +2447,7 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   Security/security_export.h \
   SecurityLevel2C.h \
+  SSLIOP/SSLIOP_Export.h \
   SecurityLevel1C.h \
   SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2467,7 +2470,6 @@ realclean: clean
   SecurityLevel2C.i \
   SecurityReplaceableC.i \
   SSLIOPC.h \
-  SSLIOP/SSLIOP_Export.h \
   SSLIOPC.i \
   SSLIOP/SSLIOP_Credentials.h SSLIOP/SSLIOP_Export.h SSLIOP/SSLIOP_X509.h \
   SSLIOP/SSLIOP_X509.inl SSLIOP/SSLIOP_EVP_PKEY.h \
@@ -2668,7 +2670,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -2687,6 +2688,7 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -2955,7 +2957,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -2974,6 +2975,7 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -3248,7 +3250,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -3449,7 +3450,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Security/security_export.h \
+  SSLIOP/SSLIOP_Export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -3468,13 +3469,13 @@ realclean: clean
   SecurityC.i \
   SSLIOP/SSLIOP_Vault.h \
   SecurityReplaceableC.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
   SecurityLevel2C.i \
   SecurityReplaceableC.i \
   SSLIOPC.h \
-  SSLIOP/SSLIOP_Export.h \
   SSLIOPC.i \
   $(TAO_ROOT)/tao/debug.h SSLIOP/SSLIOP_Current.h \
   SSLIOP/SSLIOP_Current_Impl.h \
@@ -3746,7 +3747,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Security/security_export.h \
+  SSLIOP/SSLIOP_Export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -3787,7 +3788,6 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor_Impl.h SSLIOP/SSLIOP_Acceptor.h \
   SSLIOP/IIOP_SSL_Acceptor.h SSLIOP/IIOP_SSL_Connection_Handler.h \
   SSLIOPC.h \
-  SSLIOP/SSLIOP_Export.h \
   SSLIOPC.i \
   $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \
   $(TAO_ROOT)/tao/Connection_Handler.h \
@@ -3859,6 +3859,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
   SSLIOP/SSLIOP_Current.h SSLIOP/SSLIOP_Current_Impl.h \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -4178,7 +4179,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -4405,7 +4405,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -4557,6 +4556,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Dynamic.i SSLIOP/SSLIOP_Current.h \
   SSLIOP/SSLIOP_Current_Impl.h \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
@@ -4907,7 +4907,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -4921,6 +4920,7 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -5265,7 +5265,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -5350,6 +5349,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
   SSLIOP/SSLIOP_Current.h SSLIOP/SSLIOP_Current_Impl.h \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -5795,7 +5795,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -5809,6 +5808,7 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -6058,7 +6058,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -6167,6 +6166,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \
   SSLIOP/SSLIOP_Current.h SSLIOP/SSLIOP_Current_Impl.h \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -6612,7 +6612,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -6626,6 +6625,7 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -6999,7 +6999,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -7013,6 +7012,7 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
+  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -7246,7 +7246,6 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   SSLIOP/SSLIOP_Export.h \
   SecurityC.h \
-  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -7445,7 +7444,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  SSLIOP/SSLIOP_Export.h SecurityC.h Security/security_export.h \
+  SSLIOP/SSLIOP_Export.h SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index 715dea33e34..d179fd9c574 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -14,8 +14,11 @@
 #include "tao/Invocation.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Connect_Strategy.h"
+#include "tao/Wait_Strategy.h"
+
 #include "ace/Strategies_T.h"
 
+
 ACE_RCSID (TAO_SSLIOP,
            IIOP_SSL_Connector,
            "$Id$")