diff options
Diffstat (limited to 'TAO/DevGuideExamples')
12 files changed, 112 insertions, 161 deletions
diff --git a/TAO/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp b/TAO/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp index bf7f62b4262..c7801878f91 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp @@ -12,25 +12,24 @@ // Implementation skeleton constructor Messenger_i::Messenger_i (void) - { +{ std::cout << "Hello"; - } +} // Implementation skeleton destructor Messenger_i::~Messenger_i (void) - { - } +{ +} CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, char *& message ) - { - //Add your implementation here - std::cerr << "Message from: " << user_name << std::endl; - std::cerr << "Subject: " << subject << std::endl; - std::cerr << "Message: " << message << std::endl; - return 1; - } - +{ + //Add your implementation here + std::cerr << "Message from: " << user_name << std::endl; + std::cerr << "Subject: " << subject << std::endl; + std::cerr << "Message: " << message << std::endl; + return 1; +} diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp index 3b974178619..5953b384fc4 100644 --- a/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp +++ b/TAO/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp @@ -17,17 +17,17 @@ parse_args (int argc, ACE_TCHAR *argv[]) while ((c = get_opts ()) != -1) switch (c) - { - case 'o': - ior_output_file = get_opts.optarg; - break; - - case '?': - default: - std::cerr << "usage: " << argv[0] << " -o <ior>" << std::endl; - return -1; - break; - } + { + case 'o': + ior_output_file = get_opts.optarg; + break; + + case '?': + default: + std::cerr << "usage: " << argv[0] << " -o <ior>" << std::endl; + return -1; + break; + } return 0; } @@ -48,7 +48,7 @@ ACE_TMAIN(int argc, ACE_TCHAR* argv[]) // Find the Naming Service. CORBA::Object_var rootObj = orb->resolve_initial_references("NameService"); CosNaming::NamingContext_var rootNC = - CosNaming::NamingContext::_narrow(rootObj.in()); + CosNaming::NamingContext::_narrow(rootObj.in()); // Get the Root POA. CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); @@ -85,12 +85,10 @@ ACE_TMAIN(int argc, ACE_TCHAR* argv[]) orb->destroy(); } - catch(const CORBA::Exception& ex) { - std::cerr << ex << std::endl; - return 1; - } + catch(const CORBA::Exception& ex) + { + std::cerr << ex << std::endl; + return 1; + } return 0; - } - - diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp index efa055ff1da..f577dc6fe08 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp @@ -15,10 +15,10 @@ main(int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService"); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow(naming_obj.in()); + CosNaming::NamingContext::_narrow(naming_obj.in()); CosNaming::Name name; name.length (1); @@ -26,21 +26,21 @@ main(int argc, char *argv[]) CORBA::Object_var ecObj = naming_context->resolve(name); CosNotifyChannelAdmin::EventChannel_var ec = - CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in()); + CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in()); CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = - CosNotifyChannelAdmin::OR_OP; + CosNotifyChannelAdmin::OR_OP; CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->new_for_consumers(ifgop, - adminid); + ec->new_for_consumers(ifgop, + adminid); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in()); + PortableServer::POA::_narrow (poa_object.in()); StructuredEventConsumer_i servant (orb.in()); @@ -54,19 +54,16 @@ main(int argc, char *argv[]) CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id; CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier = - consumer_admin->obtain_notification_push_supplier( - CosNotifyChannelAdmin::STRUCTURED_EVENT, - consumeradmin_proxy_id); + consumer_admin->obtain_notification_push_supplier( + CosNotifyChannelAdmin::STRUCTURED_EVENT, + consumeradmin_proxy_id); CosNotifyChannelAdmin::StructuredProxyPushSupplier_var supplier_proxy; supplier_proxy = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow(proxy_supplier.in()); + _narrow(proxy_supplier.in()); supplier_proxy->connect_structured_push_consumer(consumer.in()); - - - CosNotification::EventTypeSeq added (1); CosNotification::EventTypeSeq removed (1); added.length (1); @@ -80,24 +77,17 @@ main(int argc, char *argv[]) supplier_proxy->subscription_change(added, removed); - - - - PortableServer::POAManager_var poa_manager = poa->the_POAManager(); poa_manager->activate(); orb->run(); - - } + } catch(const CORBA::Exception& ex) { - std::cerr << "Caught exception: " << ex << std::endl; - return 1; + std::cerr << "Caught exception: " << ex << std::endl; + return 1; } return 0; } - - diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp index 2528e7ffb55..1faed52af5c 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp @@ -34,8 +34,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::EventChannel_var ec = notify_factory->create_channel (initial_qos, - initial_admin, - id); + initial_admin, + id); name[0].id = CORBA::string_dup ("MyEventChannel"); @@ -52,8 +52,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = supplier_admin->obtain_notification_push_consumer( - CosNotifyChannelAdmin::STRUCTURED_EVENT, - supplieradmin_proxy_id); + CosNotifyChannelAdmin::STRUCTURED_EVENT, + supplieradmin_proxy_id); StructuredEventSupplier_i *servant = new StructuredEventSupplier_i(orb_.in()); @@ -77,7 +77,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) connect_structured_push_supplier (supplier.in()); } - Messenger_i::~Messenger_i (void) { } @@ -87,7 +86,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - ACE_OS::printf("Message from: %s\nSubject: %s\nMessage: %s\n", user_name, subject, message); //cout << "Message from: " << user_name << endl; @@ -123,5 +121,4 @@ CORBA::Boolean Messenger_i::send_message ( consumer_proxy_->push_structured_event(event); return 1; - } diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp index 8459de9ec0f..300367ca26e 100644 --- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp @@ -9,9 +9,8 @@ #include <iostream> Messenger_i::Messenger_i (CORBA::ORB_ptr orb) - : orb_(CORBA::ORB::_duplicate(orb)) + : orb_(CORBA::ORB::_duplicate(orb)) { - CORBA::Object_var poa_object = orb_->resolve_initial_references("RootPOA"); @@ -23,7 +22,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil(naming_obj.in())) { - std::cerr << "Unable to find naming service" << std::endl; + std::cerr << "Unable to find naming service" << std::endl; } CosNaming::NamingContext_var naming_context = @@ -48,8 +47,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::EventChannel_var ec = notify_factory->create_channel (initial_qos, - initial_admin, - id); + initial_admin, + id); if (CORBA::is_nil (ec.in())) { std::cerr << "Unable to crete event channel" << std::endl; @@ -75,8 +74,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = supplier_admin->obtain_notification_push_consumer( - CosNotifyChannelAdmin::STRUCTURED_EVENT, - supplieradmin_proxy_id); + CosNotifyChannelAdmin::STRUCTURED_EVENT, + supplieradmin_proxy_id); StructuredEventSupplier_i *servant = new StructuredEventSupplier_i(orb_.in()); @@ -85,11 +84,11 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) servant->_this(); s_proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer:: + CosNotifyChannelAdmin::StructuredProxyPushConsumer:: _narrow(proxy_consumer.in()); if (CORBA::is_nil (s_proxy_consumer_.in())) { - std::cerr << "Unable to find structured proxy push consumer" << std::endl; + std::cerr << "Unable to find structured proxy push consumer" << std::endl; } s_proxy_consumer_-> @@ -107,16 +106,12 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) removed[0].type_name = CORBA::string_dup ("*"); s_proxy_consumer_->offer_change(added, removed); - } - - Messenger_i::~Messenger_i (void) { } - CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, @@ -157,5 +152,4 @@ CORBA::Boolean Messenger_i::send_message ( s_proxy_consumer_->push_structured_event(event); return 1; - } diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp index 15797c40487..04d81888e70 100644 --- a/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp +++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp @@ -15,10 +15,10 @@ main(int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService"); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow(naming_obj.in()); + CosNaming::NamingContext::_narrow(naming_obj.in()); CosNaming::Name name; name.length (1); @@ -26,20 +26,20 @@ main(int argc, char *argv[]) CORBA::Object_var ecObj = naming_context->resolve(name); CosNotifyChannelAdmin::EventChannel_var ec = - CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in()); + CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in()); CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = - CosNotifyChannelAdmin::OR_OP; + CosNotifyChannelAdmin::OR_OP; CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->new_for_consumers(ifgop, adminid); + ec->new_for_consumers(ifgop, adminid); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in()); + PortableServer::POA::_narrow (poa_object.in()); StructuredEventConsumer_i servant (orb.in()); @@ -53,17 +53,17 @@ main(int argc, char *argv[]) CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id; CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier = - consumer_admin->obtain_notification_push_supplier( - CosNotifyChannelAdmin::STRUCTURED_EVENT, - consumeradmin_proxy_id); + consumer_admin->obtain_notification_push_supplier( + CosNotifyChannelAdmin::STRUCTURED_EVENT, + consumeradmin_proxy_id); CosNotifyChannelAdmin::StructuredProxyPushSupplier_var supplier_proxy; supplier_proxy = - CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy_supplier.in()); + CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy_supplier.in()); - CosNotification::QoSProperties properties (1); + CosNotification::QoSProperties properties (1); - properties.length (1); + properties.length (1); properties[0].name = CORBA::string_dup (CosNotification::OrderPolicy); properties[0].value <<= CosNotification::FifoOrder; @@ -88,15 +88,12 @@ main(int argc, char *argv[]) poa_manager->activate(); orb->run(); - - } + } catch(const CORBA::Exception& ex) { - std::cerr << "Caught exception: " << ex << std::endl; - return 1; + std::cerr << "Caught exception: " << ex << std::endl; + return 1; } return 0; } - - diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp index c8dfa449bec..562683a0f03 100644 --- a/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp +++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp @@ -15,7 +15,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) CORBA::Object_var rootObj = orb->resolve_initial_references("NameService"); CosNaming::NamingContext_var rootNC = - CosNaming::NamingContext::_narrow(rootObj.in()); + CosNaming::NamingContext::_narrow(rootObj.in()); CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()); @@ -43,6 +43,4 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } - diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp index 155b6a7a0df..16f4e470806 100644 --- a/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp @@ -11,7 +11,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -47,8 +46,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::EventChannel_var ec = notify_factory->create_channel (initial_qos, - initial_admin, - id); + initial_admin, + id); name[0].id = CORBA::string_dup ("MyEventChannel"); @@ -65,8 +64,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = supplier_admin->obtain_notification_push_consumer( - CosNotifyChannelAdmin::STRUCTURED_EVENT, - supplieradmin_proxy_id); + CosNotifyChannelAdmin::STRUCTURED_EVENT, + supplieradmin_proxy_id); StructuredEventSupplier_i *servant = new StructuredEventSupplier_i(orb_.in()); @@ -104,7 +103,6 @@ CORBA::Boolean Messenger_i::send_message ( std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; - // Event Definition CosNotification::StructuredEvent event; @@ -136,6 +134,4 @@ CORBA::Boolean Messenger_i::send_message ( consumer_proxy_->push_structured_event(event); return 1; - } - diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp index 390ef447403..9a1326b113c 100644 --- a/TAO/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp +++ b/TAO/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp @@ -18,10 +18,10 @@ main(int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService"); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow(naming_obj.in()); + CosNaming::NamingContext::_narrow(naming_obj.in()); CosNaming::Name name; name.length (1); @@ -29,29 +29,29 @@ main(int argc, char *argv[]) CORBA::Object_var ecObj = naming_context->resolve(name); CosNotifyChannelAdmin::EventChannel_var ec = - CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in()); + CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in()); CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = - CosNotifyChannelAdmin::OR_OP; + CosNotifyChannelAdmin::OR_OP; CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->new_for_consumers(ifgop, - adminid); + ec->new_for_consumers(ifgop, + adminid); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA"); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in()); + PortableServer::POA::_narrow (poa_object.in()); CORBA::Object_var rtorb_obj = orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (rtorb_obj.in ()); // Create an RT POA with a lane at the given priority. CORBA::Policy_var priority_model_policy = - rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - DEFAULT_PRIORITY); + rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, + DEFAULT_PRIORITY); RTCORBA::ThreadpoolLanes lanes (2); lanes.length (2); @@ -73,16 +73,16 @@ main(int argc, char *argv[]) // Create the thread-pool. RTCORBA::ThreadpoolId threadpool_id = - rt_orb->create_threadpool_with_lanes (stacksize, - lanes, - allow_borrowing, - allow_request_buffering, - max_buffered_requests, - max_request_buffer_size); + rt_orb->create_threadpool_with_lanes (stacksize, + lanes, + allow_borrowing, + allow_request_buffering, + max_buffered_requests, + max_request_buffer_size); // Create a thread-pool policy. CORBA::Policy_var lanes_policy = - rt_orb->create_threadpool_policy (threadpool_id); + rt_orb->create_threadpool_policy (threadpool_id); CORBA::PolicyList poa_policy_list(2); poa_policy_list.length (2); @@ -92,16 +92,16 @@ main(int argc, char *argv[]) PortableServer::POAManager_var poa_manager = poa->the_POAManager (); PortableServer::POA_var rt_poa = poa->create_POA ("RT POA", - poa_manager.in (), - poa_policy_list); + poa_manager.in (), + poa_policy_list); StructuredEventConsumer_i servant (orb.in()); PortableServer::ObjectId_var objectId = - rt_poa->activate_object (&servant); + rt_poa->activate_object (&servant); CORBA::Object_var consumer_obj = - rt_poa->id_to_reference (objectId.in ()); + rt_poa->id_to_reference (objectId.in ()); CosNotifyComm::StructuredPushConsumer_var consumer = CosNotifyComm::StructuredPushConsumer::_narrow (consumer_obj.in ()); @@ -138,18 +138,15 @@ main(int argc, char *argv[]) CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id; CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier = - consumer_admin->obtain_notification_push_supplier( - CosNotifyChannelAdmin::STRUCTURED_EVENT, - consumeradmin_proxy_id); + consumer_admin->obtain_notification_push_supplier( + CosNotifyChannelAdmin::STRUCTURED_EVENT, + consumeradmin_proxy_id); CosNotifyChannelAdmin::StructuredProxyPushSupplier_var supplier_proxy; supplier_proxy = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow(proxy_supplier.in()); + _narrow(proxy_supplier.in()); supplier_proxy->connect_structured_push_consumer(consumer.in()); - - - CosNotification::EventTypeSeq added (1); CosNotification::EventTypeSeq removed (1); @@ -164,22 +161,15 @@ main(int argc, char *argv[]) supplier_proxy->subscription_change(added, removed); - - - - poa_manager->activate(); orb->run(); - - } + } catch(const CORBA::Exception& ex) { - std::cerr << "Caught exception: " << ex << std::endl; - return 1; + std::cerr << "Caught exception: " << ex << std::endl; + return 1; } return 0; } - - diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp index f1a39b49590..5ce7f42ef0e 100644 --- a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp @@ -14,7 +14,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -36,8 +35,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::EventChannel_var ec = notify_factory->create_channel (initial_qos, - initial_admin, - id); + initial_admin, + id); name[0].id = CORBA::string_dup ("MyEventChannel"); @@ -82,8 +81,8 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = supplier_admin->obtain_notification_push_consumer( - CosNotifyChannelAdmin::STRUCTURED_EVENT, - supplieradmin_proxy_id); + CosNotifyChannelAdmin::STRUCTURED_EVENT, + supplieradmin_proxy_id); StructuredEventSupplier_i *servant = new StructuredEventSupplier_i(orb_.in()); @@ -123,7 +122,6 @@ CORBA::Boolean Messenger_i::send_message ( //cout << "Subject: " << subject << endl; //cout << "Message: " << message << endl; - // Event Definition CosNotification::StructuredEvent event; @@ -153,6 +151,4 @@ CORBA::Boolean Messenger_i::send_message ( consumer_proxy_->push_structured_event(event); return 1; - } - diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp index 271808ceffd..bf00c1e5471 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp @@ -5,7 +5,6 @@ #include <iostream> #include "Messenger_i.h" - // Implementation skeleton constructor Messenger_i::Messenger_i (void) { @@ -16,7 +15,6 @@ Messenger_i::~Messenger_i (void) { } - void Messenger_i::send_message (const CORBA::OctetSeq & user_name) { try @@ -30,7 +28,7 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name) // Obtain a reference to the CodecFactory. CORBA::Object_var obj = - orb->resolve_initial_references ("CodecFactory"); + orb->resolve_initial_references ("CodecFactory"); IOP::CodecFactory_var codec_factory; @@ -70,5 +68,4 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name) std::cerr << "exception received" << std::endl; ACE_OS::exit(1); } - } diff --git a/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp index 68fd1fec4db..954df24b0fc 100644 --- a/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp @@ -90,7 +90,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) { case 'e': which = ACE_OS::atoi(get_opts.optarg); - if(which < 1 || 2 < which) + if(which < 1 || 2 < which) ACE_ERROR_RETURN ((LM_ERROR, "Usage: %s " "-e [12]" @@ -153,10 +153,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) trust <<= establish_trust; CORBA::Policy_var policy = - orb->create_policy (Security::SecQOPPolicy, protection); + orb->create_policy (Security::SecQOPPolicy, protection); CORBA::Policy_var policy2 = - orb->create_policy (Security::SecEstablishTrustPolicy, trust); + orb->create_policy (Security::SecEstablishTrustPolicy, trust); policy_list.length (1); policy_list[0] = CORBA::Policy::_duplicate (policy.in ()); @@ -184,4 +184,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } - |