summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Security/Callback
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Security/Callback')
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client.cpp37
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client_i.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server.cpp30
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.cpp10
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.h6
6 files changed, 31 insertions, 58 deletions
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 7d8d96bc98f..3e5862fe0ed 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -12,8 +12,7 @@ const char *cert_file = "cacert.pem";
int
main (int argc, char *argv[])
{
- ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
+ try
{
ACE_TString env ("SSL_CERT_FILE=");
env += cert_file;
@@ -23,25 +22,22 @@ main (int argc, char *argv[])
// Initialize the ORB
//
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, ""
- ACE_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "");
//
// Get the Root POA.
//
CORBA::Object_var obj =
- orb->resolve_initial_references ("RootPOA"
- ACE_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references ("RootPOA");
PortableServer::POA_var poa =
- PortableServer::POA::_narrow (obj.in ()
- ACE_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (obj.in ());
//
// Get a reference to the server.
//
obj = orb->string_to_object ("file://server.ior"
- ACE_ENV_ARG_PARAMETER);
+ );
if (CORBA::is_nil (obj.in ()))
{
@@ -55,8 +51,7 @@ main (int argc, char *argv[])
// Downcast the IOR to the appropriate object type.
//
server_var server_obj =
- server::_narrow (obj.in ()
- ACE_ENV_ARG_PARAMETER);
+ server::_narrow (obj.in ());
if (CORBA::is_nil (server_obj.in ()))
{
@@ -87,34 +82,28 @@ main (int argc, char *argv[])
//
// Set the server's callback and invoke the test request.
//
- server_obj->set_client (client_ref.in ()
- ACE_ENV_ARG_PARAMETER);
+ server_obj->set_client (client_ref.in ());
- server_obj->test_request ("first secure callback to client"
- ACE_ENV_ARG_PARAMETER);
+ server_obj->test_request ("first secure callback to client");
//
// Repeat the callback test.
//
- server_obj->set_client (client_ref.in () ACE_ENV_ARG_PARAMETER);
- server_obj->test_request ("second secure callback to client"
- ACE_ENV_ARG_PARAMETER);
+ server_obj->set_client (client_ref.in ());
+ server_obj->test_request ("second secure callback to client");
server_obj->shutdown ();
- poa->destroy (1, 1
- ACE_ENV_ARG_PARAMETER);
+ poa->destroy (1, 1);
orb->destroy ();
}
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- ACE_TEXT ("Caught exception\n"));
+ ex._tao_print_exception (ACE_TEXT ("Caught exception\n"));
return -1;
}
- ACE_ENDTRY;
return 0;
}
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index ff5ecb97cb4..30af277ad32 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -15,8 +15,7 @@ client_i::~client_i (void)
}
void
-client_i::test_reply (const char *msg
- ACE_ENV_ARG_DECL_NOT_USED)
+client_i::test_reply (const char *msg)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG((LM_INFO,
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index e5d6603aca9..593fac1e9a2 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -30,8 +30,7 @@ public:
client_i (server_ptr s);
virtual ~client_i (void);
- virtual void test_reply (const char *msg
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ virtual void test_reply (const char *msg)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index ce444768711..f3b2e230f87 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -12,8 +12,7 @@ const char *cert_file = "cacert.pem";
int
main (int argc, char *argv[])
{
- ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
+ try
{
ACE_TString env ("SSL_CERT_FILE=");
env += cert_file;
@@ -23,19 +22,16 @@ main (int argc, char *argv[])
// Initialize the ORB
//
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, ""
- ACE_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (argc, argv, "");
//
// Get the Root POA.
//
CORBA::Object_var obj =
- orb->resolve_initial_references ("RootPOA"
- ACE_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references ("RootPOA");
PortableServer::POA_var poa =
- PortableServer::POA::_narrow (obj.in ()
- ACE_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (obj.in ());
//
// Create the server, get object reference,
@@ -48,14 +44,11 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var theServer = tmp;
PortableServer::ObjectId_var oid =
- poa->activate_object (theServer.in ()
- ACE_ENV_ARG_PARAMETER);
+ poa->activate_object (theServer.in ());
CORBA::Object_var server_obj =
- poa->id_to_reference (oid.in ()
- ACE_ENV_ARG_PARAMETER);
+ poa->id_to_reference (oid.in ());
CORBA::String_var server_IORString =
- orb->object_to_string (server_obj.in ()
- ACE_ENV_ARG_PARAMETER);
+ orb->object_to_string (server_obj.in ());
//
// Write the IOR to a file.
@@ -81,19 +74,16 @@ main (int argc, char *argv[])
orb->run ();
- poa->destroy (1, 1
- ACE_ENV_ARG_PARAMETER);
+ poa->destroy (1, 1);
orb->destroy ();
}
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- ACE_TEXT ("Caught exception\n"));
+ ex._tao_print_exception (ACE_TEXT ("Caught exception\n"));
return -1;
}
- ACE_ENDTRY;
return 0;
}
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index 8b465287492..b16ab2f3f1f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -15,24 +15,22 @@ server_i::~server_i (void)
}
void
-server_i::set_client (client_ptr c
- ACE_ENV_ARG_DECL_NOT_USED)
+server_i::set_client (client_ptr c)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->client_ = client::_duplicate (c);
}
void
-server_i::test_request (const char *msg
- ACE_ENV_ARG_DECL)
+server_i::test_request (const char *msg)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->client_->test_reply (msg ACE_ENV_ARG_PARAMETER);
+ this->client_->test_reply (msg);
}
void
server_i::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0);
}
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 262925a1de1..fe6d4278022 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -30,12 +30,10 @@ public:
server_i (CORBA::ORB_ptr orb);
virtual ~server_i (void);
- virtual void set_client (client_ptr c
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ virtual void set_client (client_ptr c)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void test_request (const char *msg
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ virtual void test_request (const char *msg)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void shutdown (void)
View Lorry Controller Status