diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/orbsvcs/examples/Security | |
parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/examples/Security')
8 files changed, 16 insertions, 44 deletions
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index 2153014c111..0dd55de9ce9 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -14,14 +14,13 @@ static int authorize_1 = 1; static int authorize_2 = 1; CORBA::Boolean -SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL) +SLevel1_Server_i::authorize_level1 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { /// Get a reference to the SecurityCurrent object. CORBA::Object_var obj = orb->resolve_initial_references ("SecurityCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); /// Narrow it down correctly. SecurityLevel1::Current_var current = @@ -110,7 +109,7 @@ SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL) CORBA::Boolean -SLevel1_Server_i::authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +SLevel1_Server_i::authorize_level2 (void) 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 d284e65c293..0e7ae144123 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 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean authorize_level1 (void) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Boolean authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + CORBA::Boolean authorize_level2 (void) 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 b7779c65615..52c321d9be2 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -38,18 +38,15 @@ main (int argc, char *argv []) { CORBA::ORB_var orb = 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 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; SLevel1_Server_var server = SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -60,8 +57,7 @@ main (int argc, char *argv []) } CORBA::Boolean authorized = - server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->authorize_level1 (); if (authorized == 0) ACE_DEBUG ((LM_DEBUG, @@ -70,11 +66,9 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "DENIED: You Do NOT have enough privileges\n")); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 2b39bda82e3..a5a5668efb0 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -16,12 +16,10 @@ main (int argc, char *argv[]) /// Our regular ORB Initialization. CORBA::ORB_var orb = 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" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -31,18 +29,15 @@ main (int argc, char *argv[]) /// Narrow down the reference to the currect interface. PortableServer::POA_var root_poa = 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 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + level1_server._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -61,7 +56,6 @@ main (int argc, char *argv[]) orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SytemException, ex) diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index 507bdde5847..d65c9b9c47d 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -40,18 +40,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = 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 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -68,15 +65,12 @@ main (int argc, char *argv[]) if (line == 0) break; server->send_line (line ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; buf.alloc ()->free (line); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 97a4beace1c..2a9c9f54a42 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -41,11 +41,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -54,11 +52,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -66,12 +62,10 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server_impl._this (); CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -88,16 +82,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); 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 93ba5bb076d..63199f1aa88 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -17,7 +17,7 @@ Simple_Server_i::send_line (const char *line } void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (void) 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 f0c4aa7be58..76894de600f 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h @@ -35,7 +35,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: |