diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Security')
19 files changed, 104 insertions, 104 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp index 33af822572f..0e88335606d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp @@ -17,14 +17,14 @@ TAO_EstablishTrustPolicy::~TAO_EstablishTrustPolicy (void) } CORBA::PolicyType -TAO_EstablishTrustPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecEstablishTrustPolicy; } CORBA::Policy_ptr -TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EstablishTrustPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::EstablishTrust -TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->trust_; diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h index 5fd059b6a07..d83f0efe367 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h @@ -51,20 +51,20 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the "establish trust" value associated with this /// policy. virtual Security::EstablishTrust trust ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp index 9d724bd1bf1..08842a884d3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp @@ -20,14 +20,14 @@ TAO_InvocationCredentialsPolicy::~TAO_InvocationCredentialsPolicy (void) CORBA::PolicyType TAO_InvocationCredentialsPolicy::policy_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecInvocationCredentialsPolicy; } CORBA::Policy_ptr -TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_InvocationCredentialsPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_InvocationCredentialsPolicy *policy = 0; @@ -45,13 +45,13 @@ TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) void TAO_InvocationCredentialsPolicy::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } SecurityLevel2::CredentialsList * -TAO_InvocationCredentialsPolicy::creds (TAO_ENV_SINGLE_ARG_DECL) +TAO_InvocationCredentialsPolicy::creds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel2::CredentialsList *creds = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h index 8f9fa4ef129..6482e1815a4 100644 --- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h @@ -57,20 +57,20 @@ public: */ //@{ virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the list of invocation credentials associated with this /// policy. virtual SecurityLevel2::CredentialsList * creds ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp index b5be5045b7a..d5cb2b2d989 100644 --- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp @@ -17,14 +17,14 @@ TAO_MechanismPolicy::~TAO_MechanismPolicy (void) } CORBA::PolicyType -TAO_MechanismPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_MechanismPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecMechanismsPolicy; } CORBA::Policy_ptr -TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_MechanismPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_MechanismPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_MechanismPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_MechanismPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::MechanismTypeList * -TAO_MechanismPolicy::mechanisms (TAO_ENV_SINGLE_ARG_DECL) +TAO_MechanismPolicy::mechanisms (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::MechanismTypeList *mechs = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h index 7a61ec97227..0e2785c53f9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h @@ -52,19 +52,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the list of mechanism types associated with this policy. virtual Security::MechanismTypeList mechanisms ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp index 8d7ae7ea699..f5f8d674bc3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp @@ -32,7 +32,7 @@ TAO_PrincipalAuthenticator::~TAO_PrincipalAuthenticator (void) Security::AuthenticationMethodList * TAO_PrincipalAuthenticator::get_supported_authen_methods ( const char * /* mechanism */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { #if 0 @@ -77,7 +77,7 @@ TAO_PrincipalAuthenticator::authenticate ( SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::AuthenticationStatus status = Security::SecAuthFailure; @@ -100,7 +100,7 @@ TAO_PrincipalAuthenticator::authenticate ( creds, continuation_data, auth_specific_data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); if (status == Security::SecAuthSuccess @@ -111,7 +111,7 @@ TAO_PrincipalAuthenticator::authenticate ( if (status == Security::SecAuthSuccess) { this->security_manager_->add_own_credentials (creds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); } @@ -124,7 +124,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::AuthenticationStatus status = Security::SecAuthFailure; @@ -144,7 +144,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( creds, continuation_data, auth_specific_data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); if (status == Security::SecAuthSuccess @@ -155,7 +155,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( if (status == Security::SecAuthSuccess) { this->security_manager_->add_own_credentials (creds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); } @@ -165,7 +165,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( void TAO_PrincipalAuthenticator::register_vault ( SecurityReplaceable::Vault_ptr vault - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (vault)) { @@ -207,10 +207,10 @@ tao_TAO_PrincipalAuthenticator_nil ( TAO_PrincipalAuthenticator_ptr tao_TAO_PrincipalAuthenticator_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -333,10 +333,10 @@ TAO_PrincipalAuthenticator_var::tao_nil (void) ::TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -410,17 +410,17 @@ TAO_PrincipalAuthenticator_out::operator-> (void) TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_PrincipalAuthenticator::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h index 82b6feb7269..36601d95469 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h @@ -62,7 +62,7 @@ public: /// mechanism. virtual Security::AuthenticationMethodList * get_supported_authen_methods ( const char * mechanism - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Authenticate the principal, request privileges and create @@ -85,7 +85,7 @@ public: SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Continue partially completed authentication process. @@ -94,7 +94,7 @@ public: SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -105,7 +105,7 @@ public: * @note This is a TAO-specific extension. */ void register_vault (SecurityReplaceable::Vault_ptr vault - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * @name Downcast Related Methods @@ -126,12 +126,12 @@ public: static TAO_PrincipalAuthenticator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_PrincipalAuthenticator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_PrincipalAuthenticator_ptr _nil (void) @@ -193,7 +193,7 @@ public: static TAO_PrincipalAuthenticator_ptr tao_nil (void); static TAO_PrincipalAuthenticator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp index 7cf77b5dc24..647c40061fc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp @@ -16,14 +16,14 @@ TAO_QOPPolicy::~TAO_QOPPolicy (void) } CORBA::PolicyType -TAO_QOPPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_QOPPolicy *policy = 0; @@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::QOP -TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->qop_; diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h index 0579628d355..8af3d440076 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h @@ -51,19 +51,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the Quality-of-Protection value associated with this /// policy. - virtual Security::QOP qop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual Security::QOP qop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp index ed5f8993976..28ccaa60bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp @@ -21,7 +21,7 @@ TAO_SecurityManager::~TAO_SecurityManager (void) } Security::MechandOptionsList * -TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::supported_mechanisms (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -33,7 +33,7 @@ TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::CredentialsList * -TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::own_credentials (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, @@ -55,7 +55,7 @@ TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::RequiredRights_ptr -TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::required_rights_object (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -67,7 +67,7 @@ TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::PrincipalAuthenticator_ptr -TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::principal_authenticator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -98,7 +98,7 @@ TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::AccessDecision_ptr -TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::access_decision (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -110,7 +110,7 @@ TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::AuditDecision_ptr -TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::audit_decision (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -123,7 +123,7 @@ TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL) SecurityLevel2::TargetCredentials_ptr TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -137,7 +137,7 @@ TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */ void TAO_SecurityManager::remove_own_credentials ( SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -172,7 +172,7 @@ TAO_SecurityManager::remove_own_credentials ( CORBA::Policy_ptr TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -185,7 +185,7 @@ TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */ void TAO_SecurityManager::add_own_credentials (SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h index 9260e4f3565..15667932dc1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h @@ -52,13 +52,13 @@ public: /// Return a sequence containing the security mechanisms supported /// by the Security Service. virtual Security::MechandOptionsList * supported_mechanisms ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of Credentials currently associated with the /// application itself, i.e. its own credentials. virtual SecurityLevel2::CredentialsList * own_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the RequiredRights object. @@ -68,7 +68,7 @@ public: * control. */ virtual SecurityLevel2::RequiredRights_ptr required_rights_object ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the PrincipalAuthenticator object. @@ -77,7 +77,7 @@ public: * create credentials for them. */ virtual SecurityLevel2::PrincipalAuthenticator_ptr principal_authenticator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the AccessDecision object. @@ -86,7 +86,7 @@ public: * of objects. */ virtual SecurityLevel2::AccessDecision_ptr access_decision ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the AuditDecision object. @@ -95,14 +95,14 @@ public: * be audited for a given object. */ virtual SecurityLevel2::AuditDecision_ptr audit_decision ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the TargetCredentials associated with the given object /// reference. virtual SecurityLevel2::TargetCredentials_ptr get_target_credentials ( CORBA::Object_ptr obj_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Remove the given credential from the application's own @@ -114,14 +114,14 @@ public: */ virtual void remove_own_credentials ( SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the security policy currently in effect corresponding to /// the given policy type. virtual CORBA::Policy_ptr get_security_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -138,7 +138,7 @@ public: * when credentials are created and authenticated. */ void add_own_credentials (SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index bccb5842a4d..d0cb2584117 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -26,7 +26,7 @@ TAO_Security_Current::~TAO_Security_Current (void) Security::AttributeList * TAO_Security_Current::get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -37,12 +37,12 @@ TAO_Security_Current::get_attributes ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->get_attributes (attributes TAO_ENV_ARG_PARAMETER); + return impl->get_attributes (attributes ACE_ENV_ARG_PARAMETER); } SecurityLevel2::ReceivedCredentials_ptr TAO_Security_Current::received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -53,7 +53,7 @@ TAO_Security_Current::received_credentials ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->received_credentials (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->received_credentials (ACE_ENV_SINGLE_ARG_PARAMETER); } int @@ -61,7 +61,7 @@ TAO_Security_Current::init (void) { int result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int argc = 0; @@ -69,7 +69,7 @@ TAO_Security_Current::init (void) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->orb_core_ = orb.in ()->orb_core (); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 2dd683bf77c..afe05f12842 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -63,7 +63,7 @@ public: /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -77,7 +77,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index a911373a459..6de0cea0c47 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -53,7 +53,7 @@ public: /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} @@ -67,7 +67,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index c7377f36b48..552bd7a9e6f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -17,13 +17,13 @@ ACE_RCSID (TAO_Security, void TAO_Security_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -41,10 +41,10 @@ TAO_Security_ORBInitializer::pre_init ( // Reserve a TSS slot in the ORB core internal TSS resources for the // thread-specific portion of Security::Current. size_t tss_slot = tao_info->allocate_tss_slot_id (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::Current object. @@ -64,7 +64,7 @@ TAO_Security_ORBInitializer::pre_init ( // ORB. info->register_initial_reference ("SecurityCurrent", security_current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::SecurityManager object. @@ -85,25 +85,25 @@ TAO_Security_ORBInitializer::pre_init ( // ORB. info->register_initial_reference ("SecurityManager", security_manager.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register the security policy factories. @@ -121,37 +121,37 @@ TAO_Security_ORBInitializer::register_policy_factories ( type = Security::SecQOPPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecMechanismsPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecInvocationCredentialsPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecFeaturePolicy; // Deprecated info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecDelegationDirectivePolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecEstablishTrustPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index af1aecce473..d7d0d4490e5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -48,11 +48,11 @@ class TAO_Security_Export TAO_Security_ORBInitializer public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -60,7 +60,7 @@ private: /// Register Security policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 6d69fbbcd95..ee11a590271 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -15,7 +15,7 @@ CORBA::Policy_ptr TAO_Security_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index f0f5b66640e..d5c4a57571b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -43,7 +43,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; |