diff options
Diffstat (limited to 'TAO/orbsvcs/examples/Security')
8 files changed, 36 insertions, 36 deletions
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index bbef4bc291e..2153014c111 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -14,13 +14,13 @@ static int authorize_1 = 1; static int authorize_2 = 1; CORBA::Boolean -SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL) +SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /// Get a reference to the SecurityCurrent object. CORBA::Object_var obj = - orb->resolve_initial_references ("SecurityCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("SecurityCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); /// Narrow it down correctly. @@ -110,7 +110,7 @@ SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean -SLevel1_Server_i::authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +SLevel1_Server_i::authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { /// If the owner of this invocation is authorized to invoke this diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index 7448af5dadc..d284e65c293 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -25,10 +25,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server SLevel1_Server_i (); /// - CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean authorize_level1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); static int authorized_1; diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 651169f1c21..b7779c65615 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -37,18 +37,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SLevel1_Server_var server = - SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -60,7 +60,7 @@ main (int argc, char *argv []) } CORBA::Boolean authorized = - server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER); + server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (authorized == 0) @@ -70,10 +70,10 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "DENIED: You Do NOT have enough privileges\n")); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 7a70989ebf0..2b39bda82e3 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -15,12 +15,12 @@ main (int argc, char *argv[]) { /// Our regular ORB Initialization. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get a reference to the RootPOA. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -30,18 +30,18 @@ main (int argc, char *argv[]) /// Narrow down the reference to the currect interface. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SLevel1_Server_i level1_server (); SLevel1_Server_var server = - level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER); + level1_server._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -60,7 +60,7 @@ main (int argc, char *argv[]) // Start the ORB orb->run (); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index f82560ff07e..507bdde5847 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -39,18 +39,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -67,15 +67,15 @@ main (int argc, char *argv[]) char *line = buf.read ('\n'); if (line == 0) break; - server->send_line (line TAO_ENV_ARG_PARAMETER); + server->send_line (line ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; buf.alloc ()->free (line); } - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 846d129d28e..fd1b150a481 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -38,11 +38,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -51,11 +51,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -64,11 +64,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -86,15 +86,15 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index c292b05581b..62d1ff2e04a 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -10,14 +10,14 @@ ACE_RCSID(Send_File, test_i, "$Id$") void Simple_Server_i::send_line (const char *line - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", line)); } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h index ccf178af83f..10b18e60116 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h @@ -32,10 +32,10 @@ public: // = The Simple_Server methods. void send_line (const char *line - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: |