summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Security
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Security')
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp4
15 files changed, 22 insertions, 28 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
index c600d1c71c9..8ae4f3bef13 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "CSI_Utils.h"
-#include "orbsvcs/CSIC.h"
+#include "orbsvcs/orbsvcs/CSIC.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index eeb4bc7ddc9..7818fa3504f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index a349ef444a1..6cf09884257 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 3be591bcd38..946ec411ae2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -15,13 +15,13 @@
#define TAO_SL3_CONTEXT_ESTABLISHMENT_POLICY_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
index 6e593d6345d..9c77db90c02 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -16,15 +16,15 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Security/SL3_CredentialsCurator.h"
+#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 211d93e534f..8fbca77cd78 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -284,9 +284,6 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Pseudo_Var_T<TAO::SL3::CredentialsCurator>;
-template class TAO_Pseudo_Out_T<TAO::SL3::CredentialsCurator, TAO::SL3::CredentialsCurator_var>;
-
template class ACE_Map_Entry<const char *, TAO::SL3::CredentialsAcquirerFactory *>;
template class ACE_Map_Iterator_Base<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>;
template class ACE_Map_Iterator<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>;
@@ -301,9 +298,6 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, SecurityLevel3::Ow
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Pseudo_Var_T<TAO::SL3::CredentialsCurator>
-#pragma instantiate TAO_Pseudo_Out_T<TAO::SL3::CredentialsCurator, TAO::SL3::CredentialsCurator_var>
-
#pragma instantiate ACE_Map_Entry<const char *, TAO::SL3::CredentialsAcquirerFactory *>
#pragma instantiate ACE_Map_Iterator_Base<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>
#pragma instantiate ACE_Map_Iterator<const char *, TAO::SL3::CredentialsAcquirerFactory *, ACE_Null_Mutex>
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index 712588d7548..b6b95a2c21a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -15,13 +15,13 @@
#define TAO_SL3_CREDENTIALS_CURATOR_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index b2f7d901b26..d35f2d51b0c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -16,13 +16,13 @@
#define TAO_SL3_OBJECT_CREDENTIALS_POLICY_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index 2cc6f6650f1..9c915f90d73 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -24,7 +24,7 @@
#include "SL3_SecurityCurrent_Impl.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 5b0b97162ad..fcaaa0f629c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -22,7 +22,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "security_export.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
namespace TAO
{
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 61b615e9cbb..a7efd8cb1a1 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -15,13 +15,13 @@
#define TAO_SL3_SECURITY_MANAGER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Security/security_export.h"
+#include "orbsvcs/orbsvcs/Security/security_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 673a5a2c952..c1be7b22e78 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -21,7 +21,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/ORB_Core.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index a297564e3fd..7ffe96e6d1b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -22,7 +22,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "security_export.h"
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
namespace TAO
{
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 673c4debebc..df9b15396a6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (Security,
#include "SL3_CredentialsCurator.h"
#include "SL3_SecurityManager.h"
-#include "orbsvcs/SecurityC.h"
+#include "orbsvcs/orbsvcs/SecurityC.h"
#include "tao/ORBInitInfo.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 87f0d172965..be257f8089c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -12,8 +12,8 @@ ACE_RCSID (Security,
#include "SL3_ContextEstablishmentPolicy.h"
#include "SL3_ObjectCredentialsPolicy.h"
-#include "orbsvcs/SecurityLevel2C.h"
-#include "orbsvcs/SecurityLevel3C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel3C.h"
#include "tao/ORB_Constants.h"
View Lorry Controller Status