ChangeLogTag: Mon Aug 16 16:45:06 2004 J.T. Conklin <jtc@acorntoolworks.com>

17 files changed, 33 insertions, 33 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 5ea0b77669f..d4da8a87a43 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -24,7 +24,7 @@
 
 #include "SSLIOP_Current.h"
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/SSLIOPC.h"
 #include "tao/IIOP_Connection_Handler.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index b0868330068..35c7786ddc8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -30,8 +30,8 @@
 #include "SSLIOP_Connection_Handler.h"
 #include "SSLIOP_Accept_Strategy.h"
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"  /* CSIv1 */
-#include "orbsvcs/orbsvcs/CSIIOPC.h"  /* CSIv2 */
+#include "orbsvcs/SSLIOPC.h"  /* CSIv1 */
+#include "orbsvcs/CSIIOPC.h"  /* CSIv2 */
 
 namespace TAO
 {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index aacb3c5a950..647a42edd0b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -16,16 +16,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h"
-#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
+#include "orbsvcs/SSLIOP/SSLIOP_SSL.h"
 
-#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 816b8829f44..ba933c34608 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -4,7 +4,7 @@
 #include "SSLIOP_Util.h"
 #include "SSLIOP_X509.h"
 
-#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/SecurityLevel2C.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 1480674ab2b..89b27c15a62 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -23,7 +23,7 @@
 
 #include "SSLIOP_X509.h"
 #include "SSLIOP_EVP_PKEY.h"
-#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/SecurityLevel3C.h"
 #include "tao/LocalObject.h"
 
 namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index 4a391c83497..e1d1e5778bf 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -15,16 +15,16 @@
 #define TAO_SSLIOP_CREDENTIALS_ACQUIRER_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/Security/SL3_CredentialsCurator.h"
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
-#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/SecurityLevel3C.h"
 
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
index 791dcde0da5..6918b068b0d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
@@ -16,15 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
+#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
 
-#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/SecurityLevel3C.h"
 
 
 namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 1a201756b10..1921057cfc4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -23,7 +23,7 @@
 
 #include "SSLIOP_Current_Impl.h"
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/SSLIOPC.h"
 #include "tao/ORB_Core.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 6ba6569f23b..5502393a62b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
-#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
+#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
 #include "tao/ORB_Core.h"
 
 #include <openssl/ssl.h>
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index 05456cc7c54..fdd3490f063 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -26,8 +26,8 @@
 
 #include "SSLIOP_OwnCredentials.h"
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
-#include "orbsvcs/orbsvcs/SecurityC.h"
+#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/SecurityC.h"
 
 #include "tao/IIOP_Endpoint.h"
 #include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 48e4343961d..fbb32f89f96 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -4,7 +4,7 @@
 #include "SSLIOP_ORBInitializer.h"
 #include "ace/OS_NS_strings.h"
 
-#include "orbsvcs/orbsvcs/Security/Security_ORBInitializer.h"  /// @todo should go away
+#include "orbsvcs/Security/Security_ORBInitializer.h"  /// @todo should go away
 
 //#include "orbsvcs/CSIIOPC.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index a80578eb718..73a16174959 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -25,8 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/SecurityC.h"
-#include "orbsvcs/orbsvcs/CSIIOPC.h"
+#include "orbsvcs/SecurityC.h"
+#include "orbsvcs/CSIIOPC.h"
 
 #include "tao/Protocol_Factory.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 45740ab8cd0..9e47848971a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/SSLIOPC.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index d7fe7e70c57..efa08eeb608 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -11,11 +11,11 @@ ACE_RCSID (SSLIOP,
 //#include "SSLIOP_IORInterceptor.h"
 #include "SSLIOP_CredentialsAcquirerFactory.h"
 
-#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h"
-#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/Security/SL3_SecurityCurrent.h"
+#include "orbsvcs/Security/SL3_CredentialsCurator.h"
 
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
-#include "orbsvcs/orbsvcs/CSIIOPC.h"
+#include "orbsvcs/SSLIOPC.h"
+#include "orbsvcs/CSIIOPC.h"
 
 #include "tao/Exception.h"
 #include "tao/ORBInitInfo.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 01f626a049d..544208d40b7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -22,8 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/orbsvcs/CSIIOPC.h"
-#include "orbsvcs/orbsvcs/SecurityC.h"
+#include "orbsvcs/CSIIOPC.h"
+#include "orbsvcs/SecurityC.h"
 
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h
index a4a7fc21cb0..e19b6659bf6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h
@@ -45,7 +45,7 @@
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
-#include "orbsvcs/orbsvcs/SSLIOPC.h"
+#include "orbsvcs/SSLIOPC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl
index 64feb29fa16..969aaad85f6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl
@@ -35,7 +35,7 @@
 #ifndef _SSL_ENDPOINTS_IDL_
 #define _SSL_ENDPOINTS_IDL_
 
-#include "orbsvcs/orbsvcs/SSLIOP.idl"
+#include "orbsvcs/SSLIOP.idl"
 
 // Stores information for a collection of SSLIOP endpoints.
 typedef sequence <SSLIOP::SSL> TAO_SSLEndpointSequence;