diff options
Diffstat (limited to 'TAO/orbsvcs/DevGuideExamples')
100 files changed, 423 insertions, 645 deletions
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp index d6e04baa4f1..625480e6fec 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp @@ -20,7 +20,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h index 88d3007c575..614219cd901 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h @@ -28,7 +28,7 @@ public: int event_limit); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual void send_message (const char * user_name, const char * subject, @@ -38,7 +38,6 @@ private: CORBA::ORB_var orb_; CosEventChannelAdmin::ProxyPushSupplier_var supplier_; int event_limit_; - }; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp index 33d2946cabe..0c2e1f49dd9 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp @@ -140,13 +140,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending of events.\n"; while (1) { - consumer->push (event); ACE_Time_Value tv(0, 1000 * EVENT_DELAY_MS); orb->run(tv); if ((remote_ecname != 0) && (!gateway_initialized)) { - try { // Get the remote event channel object CORBA::Object_var obj = root_context->resolve_str (ACE_TEXT_ALWAYS_CHAR (remote_ecname)); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp index bc04b0e8996..1f892b0062b 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp @@ -91,7 +91,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending events.\n"; while (1) { - event[0].header.type++; if (event[0].header.type > MY_EVENT_END) { event[0].header.type = MY_EVENT_START; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp index 45ddebdb3a4..af651e069a4 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp @@ -14,7 +14,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) // Override the disconnect_push_Supplier() operation. void EchoEventSupplier_i::disconnect_push_supplier() { - // Deactivate this object. CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow(obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp index e06fb21e21f..ffcc01d103d 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp @@ -93,7 +93,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy(); return 0; - } catch(const CORBA::Exception& exc) { diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index 18dd4175aff..58711925023 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -19,7 +19,7 @@ #include "tao/ORB_Core.h" -#include "ace/Auto_Ptr.h" +#include <memory> #include <iostream> #include <fstream> @@ -180,22 +180,20 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) receiver->connect (pub); // Create the appropriate event handler and register it with the reactor - auto_ptr<ACE_Event_Handler> eh; + std::unique_ptr<ACE_Event_Handler> eh; if (mcast) { - auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in())); + std::unique_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in())); mcast_eh->reactor (orb->orb_core ()->reactor ()); mcast_eh->open (ec.in()); - ACE_auto_ptr_reset(eh,mcast_eh.release()); - //eh.reset(mcast_eh.release()); + eh.reset(mcast_eh.release()); } else { - auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in())); + std::unique_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in())); udp_eh->reactor (orb->orb_core ()->reactor ()); ACE_INET_Addr local_addr (listenport); if (udp_eh->open (local_addr) == -1) { std::cerr << "Cannot open EH" << std::endl; } - ACE_auto_ptr_reset(eh,udp_eh.release()); - //eh.reset(udp_eh.release()); + eh.reset(udp_eh.release()); } // Create an event (just a string in this case). diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp index b86312d4220..7fc342c949b 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp @@ -37,7 +37,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) PortableServer::POA_ptr createPersistentPOA(PortableServer::POA_ptr root_poa, const char* poa_name) { - PortableServer::LifespanPolicy_var life = root_poa->create_lifespan_policy(PortableServer::PERSISTENT); diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp index cad9543fb1c..5a2521f4bf2 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h index 64dc97e2741..7e82cd7890e 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp index 51a17c26b09..a59513010b0 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h index 64dc97e2741..7e82cd7890e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp index 5e857eefb2b..9cd0461819f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp @@ -11,13 +11,13 @@ #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { std::cout << "Hello"; } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h index 64dc97e2741..7e82cd7890e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp index 9436c6ad8e6..e474955373f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp @@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp index 51a17c26b09..a59513010b0 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h index 2c39b9ac146..63ad758730f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp index 9a758e812a6..57bbf13048a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp @@ -19,7 +19,6 @@ void MessengerTask::end() int MessengerTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp index ed58ae335d9..787ab998278 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp @@ -11,12 +11,12 @@ #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h index 2c39b9ac146..63ad758730f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h @@ -21,17 +21,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp index 4e0eb4783bf..3776f962281 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h index 64dc97e2741..7e82cd7890e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp index f5ae4c1b664..a5a1587e151 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h index 5b85d67ecd4..3245e521a62 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp index 6d05f65ede8..7a21c088df0 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp @@ -12,7 +12,6 @@ EventSequenceConsumer_i::push_structured_events ( const CosNotification::EventBatch& events ) { - std::cout << "events received " << std::endl; const char* value = 0; @@ -28,14 +27,12 @@ EventSequenceConsumer_i::push_structured_events ( void EventSequenceConsumer_i::disconnect_sequence_push_consumer () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id(); poa->deactivate_object(objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp index c47f465d145..697d711ff81 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp @@ -9,14 +9,12 @@ EventSequenceSupplier_i::EventSequenceSupplier_i(CORBA::ORB_ptr orb) void EventSequenceSupplier_i::disconnect_sequence_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp index 54a3ec2ab39..0bfc413654b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp @@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -76,5 +75,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index 9e0a217a91a..60153e1b1a5 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp @@ -11,7 +11,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , supplier_(new EventSequenceSupplier_i(orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -67,7 +66,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -116,6 +115,5 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, consumer_proxy_->push_structured_events(events); return 1; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h index 524f58f339c..a74227a4345 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h @@ -31,4 +31,3 @@ private: - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp index ee8f68f6e63..7a425646582 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp @@ -49,7 +49,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) messenger->send_message ("sysadmin@company.com", "OCI's Distribution of TAO", message.inout()); - } catch(const CORBA::Exception& ex) { std::cerr << "Caught a CORBA exception: " << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp index ce7ed668126..b96c97316a5 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp @@ -147,7 +147,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); orb->destroy (); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp index 8938018d98d..0c917958e46 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp @@ -82,7 +82,6 @@ ACE_TMAIN(int argc, ACE_TCHAR* argv[]) // Accept requests orb->run(); orb->destroy(); - } catch(const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp index 10a9e283676..4ef01eb8480 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp @@ -92,7 +92,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } consumer_proxy_->connect_structured_push_supplier(supplier.in()); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; @@ -102,7 +101,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -112,14 +111,12 @@ CORBA::Boolean Messenger_i::send_message ( char *& message ) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h index 4327f7e112f..cb3d1512f6b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h @@ -15,7 +15,7 @@ public: Messenger_i (CORBA::ORB_ptr orb); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message ( const char * user_name, @@ -26,7 +26,6 @@ public: private: CORBA::ORB_var orb_; CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_; - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp index 28e2fb05627..73572e2fd88 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -27,14 +26,12 @@ void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp index a8331596d84..932640f7adf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp index 8728eb776c4..d4f1ee8853a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp index bdbdc2eb77a..34156bd41a4 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp @@ -10,7 +10,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -75,7 +74,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) connect_structured_push_supplier (supplier.in()); } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h index 2d9c4182adb..ce9aa7c930b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h @@ -9,7 +9,7 @@ class Messenger_i : public POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message (const char * user_name, const char * subject, @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index 11cb57adaf5..97d8865479b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -15,7 +15,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp index 0208d26fc7f..d32ac5960fc 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp @@ -43,10 +43,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) std::cout << "MessengerClient: success" << std::endl; return 0; - } - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp index ad834dd609c..b9acf920824 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp @@ -88,5 +88,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp index d9fb63f56d8..6e4bc4d8073 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp @@ -106,7 +106,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) s_proxy_consumer_->offer_change(added, removed); } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -115,7 +115,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h index 9ccdbcc3740..69a75da32e9 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h @@ -8,7 +8,7 @@ class Messenger_i : public POA_Messenger { public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp index a1c11e2cc82..0ec2cb4cc1e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -26,14 +25,12 @@ void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp index 0c3cf2b94d5..f7e401db29f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp index f053d4af659..7de7ea60031 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp @@ -88,7 +88,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -97,7 +97,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h index 2d9c4182adb..ce9aa7c930b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h @@ -9,7 +9,7 @@ class Messenger_i : public POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message (const char * user_name, const char * subject, @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp index e80efb54cee..f242d528c43 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,14 +26,12 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp index b11df7abb34..75ebbf9449a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp index 8728eb776c4..d4f1ee8853a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp index d269451a068..569cd0b9f57 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp @@ -105,7 +105,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h index 83115d8465c..21d197d81a2 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h @@ -10,7 +10,7 @@ class Messenger_i : public POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message (const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp index e80efb54cee..f242d528c43 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,14 +26,12 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp index 263b4d03d66..4f5d0f097ea 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp index 56bb0b9cae4..a8762480edd 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp @@ -42,7 +42,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) messenger->send_message ("person@company.com", "OCI's Distribution of TAO", message.inout()); - } catch(const CORBA::Exception& ex) { std::cerr << "Caught a CORBA exception: " << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp index 04368337c92..0aa9ba196b1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp @@ -130,7 +130,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); orb->destroy (); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp index 14e332e2672..6573ddbd7a8 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp @@ -75,14 +75,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) // Accept requests orb->run(); orb->destroy(); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; return 1; } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp index ea1a56d9e66..4410caa5332 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp @@ -103,7 +103,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } consumer_proxy_->connect_structured_push_supplier(supplier.in()); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; @@ -113,7 +112,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -127,7 +126,6 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h index 28e15e9d4f9..cb3d1512f6b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h @@ -15,7 +15,7 @@ public: Messenger_i (CORBA::ORB_ptr orb); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp index b3d363c0d52..1218fb6a243 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp @@ -11,7 +11,6 @@ void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -25,14 +24,12 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp index 8cf0e0abd35..e75774d4483 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp index 26400a9741a..55532bfbfa0 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" #include <iostream> -ClientInitializer::ClientInitializer (void) +ClientInitializer::ClientInitializer () : slot_ (0), current_ (PortableInterceptor::Current::_nil()) { @@ -65,7 +65,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) } void -ClientInitializer::set_slot_data (void) +ClientInitializer::set_slot_data () { // Set the recursion flag CORBA::Any flag; diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h index 4870f1877c3..c3d497c1008 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h @@ -11,10 +11,10 @@ class ClientInitializer : public virtual ::CORBA::LocalObject { public: - ClientInitializer (void); + ClientInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - void set_slot_data (void); + void set_slot_data (); private: PortableInterceptor::SlotId slot_; diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp index 6bdd7c6a1de..6fc2e054d63 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp @@ -19,7 +19,7 @@ ClientInterceptor (Messenger_var theMessenger, this->slot = theSlot; } -ClientInterceptor::~ClientInterceptor (void) +ClientInterceptor::~ClientInterceptor () { } @@ -84,7 +84,6 @@ ClientInterceptor::send_request ( // reset recursion test flag <<= 0; pic->set_slot(slot,flag); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h index f3ec546e4b4..17440a354b4 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h @@ -11,7 +11,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (Messenger_var theMessage, PortableInterceptor::Current_ptr thePic, diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp index 7376b2e1281..13c3a0fd154 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp @@ -59,7 +59,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::String_var message = CORBA::string_dup( "Hello!" ); messenger->send_message( "TAO User", "TAO Test", message.inout() ); - } catch(const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp index 4cbb4f32191..49f716877e6 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp @@ -12,12 +12,12 @@ #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h index e0249baef77..ed581d27abf 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h @@ -21,10 +21,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, @@ -35,7 +35,6 @@ virtual CORBA::Boolean send_message ( virtual char * get_time ( ); - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp index 7b4bef43561..80041289ce9 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp @@ -9,7 +9,7 @@ static const char* allowed_users[num_allowed_users+1] = {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0}; const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"}; -ServerInterceptor::ServerInterceptor (void) +ServerInterceptor::ServerInterceptor () : myname_ ("Server_Authentication_Interceptor") { std::cout << "Calling ServerInterceptor constructor." << std::endl; @@ -70,7 +70,7 @@ ServerInterceptor::receive_request ( std::cout << "Permission Granted " << std::endl; } else { - std::cout << "Permission Denied " << std::endl;; + std::cout << "Permission Denied " << std::endl; } } diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h index a8da1affe95..3e8e46e14a9 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h @@ -8,7 +8,7 @@ class ServerInterceptor : public PortableInterceptor::ServerRequestInterceptor { public: - ServerInterceptor (void); + ServerInterceptor (); ~ServerInterceptor (); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp index a7e2813c2d2..a0046a31b21 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp @@ -66,7 +66,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp index 4358936462e..bb3e8a4048c 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp @@ -37,7 +37,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); if (parse_args (argc, argv) != 0) @@ -84,7 +83,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Messenger Server is shut down!" << std::endl; std::cout << std::endl; - } catch(const CORBA::Exception& ex) { ex._tao_print_exception("Server Error: main block"); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp index 037e494f62d..4c71c9969b0 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp @@ -13,7 +13,7 @@ Messenger_i::Messenger_i ( { } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h index febd241327e..947ce475082 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h @@ -21,7 +21,7 @@ public: SSLIOP::Current_ptr ssliop_current ); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem index d98dd5918cb..b134e6fce3e 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/cacert.pem @@ -1,16 +1,30 @@ -----BEGIN CERTIFICATE----- -MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV -BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe -Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw -EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF -Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v -qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I -yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD -VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT -MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u -Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/ -KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6 -pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua -4ERB9b/3K4StZjMUkPmBolSIkPo= +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem index b86bd5de1d2..43f352ff7ae 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_cert.pem @@ -1,59 +1,15 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4097 (0x1001) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=Tennessee, O=DOC Group - Validity - Not Before: Jun 15 14:01:34 2011 GMT - Not After : May 25 14:01:34 2032 GMT - Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba: - b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59: - 59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc: - b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22: - 27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6: - a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19: - 89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81: - 10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c: - 06:4e:57:64:af:2d:b3:88:ef - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10 - X509v3 Authority Key Identifier: - keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A - - Signature Algorithm: sha1WithRSAEncryption - bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28: - aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5: - a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32: - 42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b: - ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f: - 76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10: - 67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1: - b9:04 -----BEGIN CERTIFICATE----- -MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx -EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx -NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT -CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD -emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj -fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY -gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ -qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg -hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O -BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc -adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI -e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX -E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx -TZuRcTfkwgLd4bkE +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem index e761037f237..47856fe8243 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/client_key.pem @@ -1,15 +1,31 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/ -Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp -TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB -AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM -xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv -UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS -lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz -HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO -6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL -RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS -FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB -JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w -UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N +SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM +3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI +B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9 +nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv +l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9 +GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb +19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6 +uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg +BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3 +NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp +0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX +v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/ +UAuwPSA6NVaSx1s= +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= +-----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem index 5402ae2497a..36d5d6755d7 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_cert.pem @@ -1,59 +1,15 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4096 (0x1000) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=Tennessee, O=DOC Group - Validity - Not Before: Jun 15 14:01:15 2011 GMT - Not After : May 25 14:01:15 2032 GMT - Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71: - 86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10: - 40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9: - 20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba: - d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e: - 1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a: - 6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7: - 9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f: - 23:83:36:f0:15:22:22:db:7b - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC - X509v3 Authority Key Identifier: - keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A - - Signature Algorithm: sha1WithRSAEncryption - 0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8: - 78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6: - 1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64: - 24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8: - 6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11: - 20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f: - 4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb: - 37:bd -----BEGIN CERTIFICATE----- -MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx -EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx -NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT -CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv -dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB -ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ -oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h -e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud -EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj -YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9 -c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa -PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB -wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7 -mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ== +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem index be238899a9f..e5c9ad87a19 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/server_key.pem @@ -1,15 +1,31 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa -HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j -AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB -AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw -T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H -2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r -/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ -/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga -EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT -mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu -eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA -Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz -ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7 +6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3 +dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp +EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ +cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw +tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl +tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg +0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R +dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h +imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq +YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V +9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO +97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k +Cqa2a+GhAm4rRto= +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= +-----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp index c3a3b8d849d..540925e5f4d 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp @@ -120,7 +120,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp index 062708bd920..8f2c72c4817 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp @@ -3,12 +3,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h index 0a628dac14e..dced78f9cd4 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h @@ -14,17 +14,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem index d98dd5918cb..b134e6fce3e 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/cacert.pem @@ -1,16 +1,30 @@ -----BEGIN CERTIFICATE----- -MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV -BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe -Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw -EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF -Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v -qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I -yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD -VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT -MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u -Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/ -KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6 -pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua -4ERB9b/3K4StZjMUkPmBolSIkPo= +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem index b86bd5de1d2..43f352ff7ae 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_cert.pem @@ -1,59 +1,15 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4097 (0x1001) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=Tennessee, O=DOC Group - Validity - Not Before: Jun 15 14:01:34 2011 GMT - Not After : May 25 14:01:34 2032 GMT - Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba: - b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59: - 59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc: - b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22: - 27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6: - a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19: - 89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81: - 10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c: - 06:4e:57:64:af:2d:b3:88:ef - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10 - X509v3 Authority Key Identifier: - keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A - - Signature Algorithm: sha1WithRSAEncryption - bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28: - aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5: - a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32: - 42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b: - ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f: - 76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10: - 67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1: - b9:04 -----BEGIN CERTIFICATE----- -MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx -EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx -NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT -CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD -emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj -fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY -gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ -qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg -hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O -BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc -adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI -e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX -E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx -TZuRcTfkwgLd4bkE +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem index e761037f237..47856fe8243 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/client_key.pem @@ -1,15 +1,31 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/ -Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp -TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB -AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM -xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv -UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS -lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz -HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO -6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL -RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS -FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB -JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w -UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N +SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM +3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI +B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9 +nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv +l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9 +GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb +19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6 +uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg +BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3 +NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp +0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX +v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/ +UAuwPSA6NVaSx1s= +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= +-----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem index 5402ae2497a..36d5d6755d7 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_cert.pem @@ -1,59 +1,15 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4096 (0x1000) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=Tennessee, O=DOC Group - Validity - Not Before: Jun 15 14:01:15 2011 GMT - Not After : May 25 14:01:15 2032 GMT - Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71: - 86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10: - 40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9: - 20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba: - d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e: - 1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a: - 6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7: - 9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f: - 23:83:36:f0:15:22:22:db:7b - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC - X509v3 Authority Key Identifier: - keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A - - Signature Algorithm: sha1WithRSAEncryption - 0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8: - 78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6: - 1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64: - 24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8: - 6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11: - 20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f: - 4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb: - 37:bd -----BEGIN CERTIFICATE----- -MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx -EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx -NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT -CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv -dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB -ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ -oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h -e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud -EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj -YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9 -c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa -PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB -wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7 -mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ== +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem index be238899a9f..e5c9ad87a19 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/server_key.pem @@ -1,15 +1,31 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa -HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j -AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB -AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw -T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H -2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r -/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ -/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga -EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT -mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu -eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA -Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz -ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7 +6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3 +dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp +EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ +cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw +tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl +tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg +0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R +dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h +imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq +YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V +9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO +97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k +Cqa2a+GhAm4rRto= +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= +-----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp index cd9f4219370..fe9a9e53fc3 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp @@ -19,12 +19,12 @@ #include "MessengerI.h" // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp index ed4ef394a2f..586ce510a09 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h index 0a628dac14e..dced78f9cd4 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h @@ -14,17 +14,16 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README index 8c5ac264903..23a6f3b525b 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README @@ -44,7 +44,7 @@ server and therefore does not need a value for SSL_CERT_FILE. Example 1: Secured server and unsecured client ---------------------------------------------- The server is configured to accept requests only via secured -connections. No specific configurationi is provided for the +connections. No specific configuration is provided for the client so it has the default configuration. The server's configuration is: diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem index d98dd5918cb..b134e6fce3e 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/cacert.pem @@ -1,16 +1,30 @@ -----BEGIN CERTIFICATE----- -MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV -BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe -Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw -EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG -9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF -Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v -qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I -yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD -VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT -MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u -Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/ -KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6 -pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua -4ERB9b/3K4StZjMUkPmBolSIkPo= +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem index b86bd5de1d2..43f352ff7ae 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_cert.pem @@ -1,59 +1,15 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4097 (0x1001) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=Tennessee, O=DOC Group - Validity - Not Before: Jun 15 14:01:34 2011 GMT - Not After : May 25 14:01:34 2032 GMT - Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba: - b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59: - 59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc: - b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22: - 27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6: - a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19: - 89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81: - 10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c: - 06:4e:57:64:af:2d:b3:88:ef - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10 - X509v3 Authority Key Identifier: - keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A - - Signature Algorithm: sha1WithRSAEncryption - bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28: - aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5: - a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32: - 42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b: - ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f: - 76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10: - 67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1: - b9:04 -----BEGIN CERTIFICATE----- -MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx -EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx -NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT -CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD -emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj -fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY -gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ -qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg -hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O -BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc -adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI -e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX -E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx -TZuRcTfkwgLd4bkE +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem index e761037f237..47856fe8243 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/client_key.pem @@ -1,15 +1,31 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/ -Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp -TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB -AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM -xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv -UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS -lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz -HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO -6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL -RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS -FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB -JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w -UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMd/wV8LZqr6VE0N +SJtITCPeoMuXJlNOHDFEcZcX4qyaJMaZrbgxOum/GCKM78jgscXF/V0GI9pd1nOM +3x3nUz50BJgCz19SgDpai+D0YbuztOAQY+d04hmC0v+ChBQeqr7Sm1FJ/OSWERfI +B8BfQovRvkkiL8xVAH3BpS5BN3RDAgMBAAECgYATQbuypvEUE/HLNjsJ8iKXW8f9 +nutuIx4Ji2fDg+S3cHGYUgE4xFfBdFaqDxyeMUI3qvLX5d3UGDa5FKH8yvV35/jv +l0EjpEbvfRonQTSHsxMeZXx6WhD4x+lft7HqkYUus8G7OBwu4NDyGzuFlK98jFN9 +GvT3H4RLrt17E525gQJBAPkmDYHboF+aNL9FUs3GdqqsMBwHu/vnc76l4i7QBkVb +19wEI6cOZxYrHXvmcbkgdXnryseXwC0WBC+nU9FAmyECQQDM/C5kHAQCvRPuP9K6 +uk/6RT+sDIkX4iut6aEMFwcna95D3eBuGs2V64Zj2/5Fc90MTsDIvqaP3Gynjevg +BybjAkEAgh54gXBlcmiD0bzvwN48jWg9+/WiHK5FSbUyykYEcGbF9ncG87FW70H3 +NQUmMYwdLl6R2emMCT/tUcHuyWMXYQJBAIZ89hrsXp1FXGw2J5YnYw26nVnOJ6wp +0aqa2/TIrwLoPL2eNv9GSpgQHO4rihobOG44xTdwDmvYnNkZviYPyy0CQEdP78VX +v/G5s/v60HWqFGcvXoaVXMNgF5+3TI+UJOxGfaZWJLghrlYvxlbmHsG2FAghlrR/ +UAuwPSA6NVaSx1s= +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPmh66pIu2aBMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAx3/BXwtmqvpUTQ1Im0hMI96gy5cmU04cMURxlxfi +rJokxpmtuDE66b8YIozvyOCxxcX9XQYj2l3Wc4zfHedTPnQEmALPX1KAOlqL4PRh +u7O04BBj53TiGYLS/4KEFB6qvtKbUUn85JYRF8gHwF9Ci9G+SSIvzFUAfcGlLkE3 +dEMCAwEAAaNQME4wHQYDVR0OBBYEFK/ZPBi//e0hop4nNTHlD999hg/vMB8GA1Ud +IwQYMBaAFK/ZPBi//e0hop4nNTHlD999hg/vMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAdhe/mvpHOgk1sj6hWsrdObOG5x2tJruzN2hkAq6bWTxzp5At +P+esuvB5BJbJDNhJSX+aWIrpYnGOmQkg+W2pFYpNjy9vWNa6wWcjrEu3zyBDBtBg +V4Z3AuuN9jJ44Hhg6azcDYTZ5/rMK3lsdATaDG/+7ZajiH8+mb4RwWjt1og= +-----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem index 5402ae2497a..36d5d6755d7 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_cert.pem @@ -1,59 +1,15 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 4096 (0x1000) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=Tennessee, O=DOC Group - Validity - Not Before: Jun 15 14:01:15 2011 GMT - Not After : May 25 14:01:15 2032 GMT - Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71: - 86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10: - 40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9: - 20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba: - d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e: - 1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a: - 6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7: - 9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f: - 23:83:36:f0:15:22:22:db:7b - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC - X509v3 Authority Key Identifier: - keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A - - Signature Algorithm: sha1WithRSAEncryption - 0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8: - 78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6: - 1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64: - 24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8: - 6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11: - 20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f: - 4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb: - 37:bd -----BEGIN CERTIFICATE----- -MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx -EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx -NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT -CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv -dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB -ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ -oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h -e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud -EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj -YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9 -c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa -PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB -wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7 -mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ== +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= -----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem index be238899a9f..e5c9ad87a19 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/server_key.pem @@ -1,15 +1,31 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa -HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j -AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB -AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw -T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H -2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r -/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ -/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga -EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT -mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu -eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA -Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz -ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOcW+/ZeeMy1Cvn7 +6ddOROHtktjtgSU+jx+KpbX/fDJZSjm0P5+Z7Xh2mtwaeiJyiBKjcEIowlHjRhv3 +dYp46VebduPL6d0K6Y+IdDiF0UAQjPZHLOvEMW1tAMB5IqYX8L1Y6aG2x1QOe3Fp +EahRcjr4DLqwnyuKFGoo6nVUzgvHAgMBAAECgYA9LYKK2LvWRd+gCqb/jwMBZOnJ +cCcOex9c1FHGetqgYa8a07M8R33stEmPF5tZ30RS2t3vRecb0rVO1hZSEGyFegdw +tFyQbB42jfo93R6HksOeMdQlHcEMP0oEu+lpxrFGn7PyKPr9oL1bJrAuVstJrrPl +tHzbG9OT6FBXYxLMYQJBAP2ftKIDYimjDARXR2cIZLm8pJeYQ39PnZeYdMEnV6Eg +0wP7OxRKouL48GQhJd4yccT5ILcnCAy/up7bR6XwCr8CQQDpQTuPkscfvSnzPH2R +dHosPhyqFjjetzqRDuE/UBBnIHVebNL7adsMeuvneAE2DP32tIOSFlGTArXqQi0h +imj5AkEA6QA/wle5ZucTsyk7v7xGTRyxWVPZLqzF6u90076BEtZFBfNYY1vuKPbq +YhLR50AQpRT6qUiCbLP3jtmFCT1toQJBALW0UF6m26GY7Y4DCFqAHxBKDnBdQU4V +9HS937A/gZekjGnTYoPh0XcmZpD5RhBCDLDbrEboRgG8sdPcW2XueZkCQFXZFVdO +97naZJ/HHrYsW2ggURzEAFYyKf03Np5t3WdKNFXv6rzHR5Fe4JPATb68Chi23R/k +Cqa2a+GhAm4rRto= +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICaDCCAdGgAwIBAgIJAPHP5kPmgsClMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK +DANPQ0kxDzANBgNVBAMMBnNlcnZlcjAeFw0yMTA5MTUwNzI2MDFaFw00OTAxMzAw +NzI2MDFaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu +IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBnNlcnZlcjCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEA5xb79l54zLUK+fvp105E4e2S2O2BJT6PH4qltf98 +MllKObQ/n5nteHaa3Bp6InKIEqNwQijCUeNGG/d1injpV5t248vp3Qrpj4h0OIXR +QBCM9kcs68QxbW0AwHkiphfwvVjpobbHVA57cWkRqFFyOvgMurCfK4oUaijqdVTO +C8cCAwEAAaNQME4wHQYDVR0OBBYEFPxdvwdaYYhNfzm6o0xpGzFWLv2sMB8GA1Ud +IwQYMBaAFPxdvwdaYYhNfzm6o0xpGzFWLv2sMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAW1Ygg90WSl/7zD7JrjFUZ/5aof7u47nuh1I/LI+QkSfMv/pP +E7oTMyXc+1e5N6CGnrqnjnxPmdM0UaN3Y/oR+rJmnhctFlSjjG0GGN3V2pkXJJcp +busPTHhBsqOSaL5oC4rTOXyVTY4PqlMCAOo/QOyxqqriaH1gVsm8B5xNrPo= +-----END CERTIFICATE----- diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h index c47878eb0fc..da4b376c2c2 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h @@ -21,7 +21,7 @@ public: kind(k); } - virtual ::CORBA::ValueBase *_copy_value (void) + virtual ::CORBA::ValueBase *_copy_value () { ::CORBA::ValueBase *ret_val = 0; ACE_NEW_THROW_EX ( diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp index ac2684ce17d..5a51f6c45e3 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp @@ -59,7 +59,6 @@ class TestConsumer : public POA_CosEventComm::PushConsumer PortableServer::POA_ptr poa_; CORBA::ORB_ptr orb_; public: - TestConsumer(int evts, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf, PortableServer::POA_ptr poa, @@ -153,11 +152,9 @@ public: void disconnect_self() { } - }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; try { @@ -202,7 +199,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { orb->destroy(); return 0; - } catch(const CORBA::Exception& e) { std::cerr << "Consumer: main() exception: " << e << std::endl; } catch(const std::invalid_argument& e) { diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp index a443e406eb6..303108b72d7 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -76,7 +76,6 @@ class TestSupplier CORBA::ORB_ptr orb_; public: - TestSupplier(int evts, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) @@ -186,12 +185,10 @@ public: }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; int pay_size = 1; try { - CORBA::ORB_var orb = CORBA::ORB_init(ac, av); if (parse_args (ac, av) != 0) @@ -247,7 +244,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { orb->destroy(); return 0; - } catch(CORBA::Exception& e) { std::cerr << "Supplier: main() exception: " << e << std::endl; } catch(std::invalid_argument& e) { |