summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Security
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Security')
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.h1
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h1
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h4
29 files changed, 0 insertions, 48 deletions
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 9c81e257b95..21be335d766 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -8,7 +8,6 @@
#include "tao/Thread_Lane_Resources.h"
-
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
void do_nothing (void)
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 0b3a484f806..66d184ba1be 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -5,7 +5,6 @@
#include "tao/AnyTypeCode/Any.h"
-
const ACE_TCHAR *ior_output_file = 0;
int no_iterations = 10;
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 0fd0602b0b4..6d40115b9ea 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -10,7 +10,6 @@
#endif /* __ACE_INLINE__ */
-
void
Callback_i::shutdown (void)
{
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
index 7536e63f0d6..f7a40ffbf10 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -36,7 +36,6 @@ public:
private:
/// The orb
CORBA::ORB_var orb_;
-
};
/**
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
index b1b539d8812..d8b35af56e5 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h
@@ -19,7 +19,6 @@
class Foo_i : public virtual POA_Foo::Bar
{
public:
-
/// Constructor.
Foo_i (CORBA::ORB_ptr,
SecurityLevel3::SecurityCurrent_ptr current);
@@ -30,13 +29,11 @@ public:
virtual void shutdown (void);
private:
-
/// Reference to the ORB.
CORBA::ORB_var orb_;
/// Reference to the "SecurityCurrent" object.
SecurityLevel3::SecurityCurrent_var current_;
-
};
#endif /* SECURE_INVOCATION_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index c359db5051a..6cbcbb68d82 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -26,16 +26,13 @@ class client_i
: public virtual POA_client
{
public:
-
client_i (server_ptr s);
virtual ~client_i (void);
virtual void test_reply (const char *msg);
private:
-
server_var server_;
-
};
#endif /* CLIENT_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 81e804e754a..5d674c48ca3 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -24,7 +24,6 @@ class server_i
: public virtual POA_server
{
public:
-
server_i (CORBA::ORB_ptr orb);
virtual ~server_i (void);
@@ -35,11 +34,9 @@ public:
virtual void shutdown (void);
private:
-
CORBA::ORB_var orb_;
client_var client_;
-
};
#endif /* SERVER_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index cc3033c6037..f79a12c7ecf 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -44,7 +44,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
-
try
{
ACE_CString env ("SSL_CERT_FILE=");
@@ -117,7 +116,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (call_shutdown)
{
-
// Let other clients to finish their task if any
ACE_OS::sleep (wait_time);
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 2bc01f9b689..e8c9238936c 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
-
try
{
ACE_CString env ("SSL_CERT_FILE=");
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index a44b4fe03df..6f2713ef5f3 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -7,7 +7,6 @@
void
Simple_Server_i::send_line (const char *)
{
-
/*
static unsigned long count = 0;
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 3e18c075205..e4039ce6ef1 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -99,7 +99,6 @@ gen_objref (int argc, ACE_TCHAR *argv[])
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Panic: nil RootPOA\n"),
1);
-
}
catch (const CORBA::Exception &ex)
{
@@ -165,5 +164,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return gen_objref(argc, argv);
return parse_objref(argc, argv);
-
}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
index 27649c77a50..64c5acf73df 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -23,7 +23,6 @@ Client_Task::svc (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n");
-
}
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
index c2919011234..e6b3d3e6fcc 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
@@ -30,7 +30,6 @@ Server_Task::svc (void)
this->event_.wait ();
-
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n"));
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
index 58430f8754a..d3840afb384 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
@@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
int
ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
-
try
{
CORBA::ORB_var orb =
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index fcc3766bfbf..d44c009f95d 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -34,7 +34,6 @@ Client_Worker::validate_connection (void)
int
Client_Worker::svc (void)
{
-
try
{
// Validate connections befire doing any actual work..
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
index cb0856a959a..011ef349b52 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
@@ -30,7 +30,6 @@
*/
class Client_Worker : public ACE_Task_Base
{
-
public:
/// ctor
Client_Worker (Simple_Server_ptr server, int niterations);
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
index 8094a5cc390..5aef7649ee1 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
@@ -31,7 +31,6 @@
class Server_Worker : public ACE_Task_Base
{
public:
-
/// Constructor
Server_Worker (CORBA::ORB_ptr orb);
@@ -42,7 +41,6 @@ public:
private:
/// The ORB
CORBA::ORB_var orb_;
-
};
#if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index d274c19202e..07bf6504936 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -16,7 +16,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
while ((c = get_opts ()) != -1)
switch (c)
{
-
case 'k':
ior = get_opts.opt_arg ();
break;
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 3f01c998b92..8dc48e6da45 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -36,7 +36,6 @@ Client_Worker::validate_connection (void)
int
Client_Worker::svc (void)
{
-
try
{
// Validate connections befire doing any actual work..
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index af5644efc9e..58dae974023 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -30,7 +30,6 @@
*/
class Client_Worker : public ACE_Task_Base
{
-
public:
/// ctor
Client_Worker (Simple_Server_ptr server,
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
index 8094a5cc390..5aef7649ee1 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
@@ -31,7 +31,6 @@
class Server_Worker : public ACE_Task_Base
{
public:
-
/// Constructor
Server_Worker (CORBA::ORB_ptr orb);
@@ -42,7 +41,6 @@ public:
private:
/// The ORB
CORBA::ORB_var orb_;
-
};
#if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index a20b3a72666..553c898e047 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -18,7 +18,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
while ((c = get_opts ()) != -1)
switch (c)
{
-
case 'k':
ior = get_opts.opt_arg ();
break;
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
index 79c342ac8aa..9dc19ba4a7c 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h
@@ -18,17 +18,14 @@
class Foo_i : public virtual POA_Foo
{
public:
-
/// Constructor.
Foo_i (CORBA::ORB_ptr);
virtual void shutdown (void);
private:
-
/// Reference to the ORB.
CORBA::ORB_var orb_;
-
};
#endif /* NULL_CIPHER_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
index 2f05d6995eb..f43e1449881 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
@@ -59,7 +59,6 @@ null_cipher_test (CORBA::ORB_ptr orb,
ACE_DEBUG ((LM_INFO,
"(%P|%t) Received CORBA::NO_PERMISSION from "
"server\n"));
-
}
}
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 7048d75aa8a..186ec8f7df6 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -19,7 +19,6 @@
class Foo_i : public virtual POA_Foo::Bar
{
public:
-
/// Constructor.
Foo_i (CORBA::ORB_ptr,
SecurityLevel3::SecurityCurrent_ptr current);
@@ -30,13 +29,11 @@ public:
virtual void shutdown (void);
private:
-
/// Reference to the ORB.
CORBA::ORB_var orb_;
/// Reference to the "SecurityCurrent" object.
SecurityLevel3::SecurityCurrent_var current_;
-
};
#endif /* SECURE_INVOCATION_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
index 64b1564a5e2..39b242a8ce8 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h
@@ -19,7 +19,6 @@
class Foo_i : public virtual POA_Foo::Bar
{
public:
-
/// Constructor.
Foo_i (CORBA::ORB_ptr,
SecurityLevel3::SecurityCurrent_ptr);
@@ -30,13 +29,11 @@ public:
virtual void shutdown (void);
private:
-
/// Reference to the ORB.
CORBA::ORB_var orb_;
/// Reference to the "SecurityCurrent" object.
SecurityLevel3::SecurityCurrent_var current_;
-
};
#endif /* SECURE_INVOCATION_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
index 22c3e57f6aa..cee6e0f4872 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
@@ -24,7 +24,6 @@ virtual CORBA::Boolean send_message (
const char * subject,
char *& message
);
-
};
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index c07ac6145d3..a41ad93f439 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -368,7 +368,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
name_service_ior_ =
orb_->object_to_string (context.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index 5d130b9aa5c..46cdc01bc6c 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -30,7 +30,6 @@
*/
class Naming_Test
{
-
public:
/// Execute the test code. <root_context> is the context to assume
/// as the root for all tests operations.
@@ -99,7 +98,6 @@ private:
/// Holds object to be registered with the Naming Service by each thread.
Test_Object_var test_ref_;
-
};
/**
@@ -233,7 +231,6 @@ public:
virtual int execute (TAO_Naming_Client &root_context);
private:
-
/// A pointer to our ORB (needed for object/string conversion).
CORBA::ORB_var orb_;
@@ -268,7 +265,6 @@ public:
virtual int execute (TAO_Naming_Client &root_context);
private:
-
/// A pointer to our ORB (used for string/object conversion).
CORBA::ORB_var orb_;