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

3 files changed, 32 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 921f76cea85..477af5d717b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -31,6 +31,7 @@ Sat Feb 22 09:06:45 2003  Ossama Othman  <ossama@uci.edu>
 Sat Feb 22 08:52:13 2003  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp:
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
 
 	  Include "tao/Wait_Strategy.h".  Necessitated by inter-header
 	  dependency reductions.
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
index fbc18c5a934..bddc5e8a329 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
+++ b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
@@ -289,6 +289,7 @@ 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 \
@@ -397,7 +398,6 @@ 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,6 +689,7 @@ 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 \
@@ -797,7 +798,6 @@ 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,6 +1064,7 @@ 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 \
@@ -1082,7 +1083,6 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
-  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -1422,6 +1422,7 @@ 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 \
@@ -1530,7 +1531,6 @@ 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 \
@@ -1829,7 +1829,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  SSLIOP/SSLIOP_Export.h \
+  Security/security_export.h \
   SecurityLevel1C.h \
   SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2035,7 +2035,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  SSLIOP/SSLIOP_Export.h \
+  Security/security_export.h \
   SecurityLevel1C.h \
   SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2241,7 +2241,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  SSLIOP/SSLIOP_Export.h \
+  Security/security_export.h \
   SecurityLevel1C.h \
   SecurityC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -2447,7 +2447,6 @@ 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 \
@@ -2470,6 +2469,7 @@ 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 \
@@ -2670,6 +2670,7 @@ 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 \
@@ -2688,7 +2689,6 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
-  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -2957,6 +2957,7 @@ 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 \
@@ -2975,7 +2976,6 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
-  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -3250,6 +3250,7 @@ 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 \
@@ -3450,7 +3451,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  SSLIOP/SSLIOP_Export.h \
+  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -3469,13 +3470,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 \
@@ -3747,7 +3748,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  SSLIOP/SSLIOP_Export.h \
+  Security/security_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -3788,6 +3789,7 @@ 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,7 +3861,6 @@ 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 \
@@ -4179,6 +4180,7 @@ 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,6 +4407,7 @@ 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 \
@@ -4556,7 +4559,6 @@ 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,6 +4909,7 @@ 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 \
@@ -4920,7 +4923,6 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
-  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -5265,6 +5267,7 @@ 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 \
@@ -5349,7 +5352,6 @@ 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 \
@@ -5476,7 +5478,9 @@ realclean: clean
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i \
   $(TAO_ROOT)/tao/Blocked_Connect_Strategy.h \
-  $(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_Accept_Strategy.o .obj/SSLIOP_Accept_Strategy.so .shobj/SSLIOP_Accept_Strategy.o .shobj/SSLIOP_Accept_Strategy.so: SSLIOP/SSLIOP_Accept_Strategy.cpp \
   SSLIOP/SSLIOP_Accept_Strategy.h $(ACE_ROOT)/ace/pre.h \
@@ -5795,6 +5799,7 @@ 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 \
@@ -5808,7 +5813,6 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
-  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -6058,6 +6062,7 @@ 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 \
@@ -6166,7 +6171,6 @@ 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,6 +6616,7 @@ 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 \
@@ -6625,7 +6630,6 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
-  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -6999,6 +7003,7 @@ 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 \
@@ -7012,7 +7017,6 @@ realclean: clean
   SecurityC.i \
   SSLIOPC.i \
   Security/Security_Current_Impl.h \
-  Security/security_export.h \
   SecurityLevel2C.h \
   SecurityLevel1C.h \
   SecurityLevel1C.i \
@@ -7246,6 +7250,7 @@ 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 \
@@ -7444,7 +7449,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  SSLIOP/SSLIOP_Export.h SecurityC.h \
+  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 \
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index e31be772f21..5edc019039b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 #include "SSLIOP_Connector.h"
 #include "SSLIOP_Credentials.h"
 #include "SSLIOP_Profile.h"
@@ -17,12 +15,15 @@
 #include "tao/Stub.h"
 #include "tao/Transport_Connector.h"
 #include "tao/Blocked_Connect_Strategy.h"
+#include "tao/Wait_Strategy.h"
 #include "ace/Auto_Ptr.h"
 
+
 ACE_RCSID (TAO_SSLIOP,
            SSLIOP_Connector,
            "$Id$")
 
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>;