diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-17 08:35:19 +0000 |
| commit | e8cc76aad5f556c77963836aacfe813876795059 (patch) | |
| tree | 17bf4f2a5f6e2e7edc70e8d4744da31f8b5478df /CIAO | |
| parent | 1ce487d19726093c9362b63847f773cb1f4e6f2a (diff) | |
| download | ATCD-e8cc76aad5f556c77963836aacfe813876795059.tar.gz | |
Remove trailing whitespaces
Diffstat (limited to 'CIAO')
228 files changed, 1629 insertions, 1629 deletions
diff --git a/CIAO/bin/PerlCIAO/generate_container.pl b/CIAO/bin/PerlCIAO/generate_container.pl index c56c03ea300..56560717f2b 100755 --- a/CIAO/bin/PerlCIAO/generate_container.pl +++ b/CIAO/bin/PerlCIAO/generate_container.pl @@ -1,21 +1,21 @@ #!/usr/bin/perl # # $Id$ -# +# # The above line is for compatibility /w Linux. Windows uses the .pl extension. # Author: Stoyan Paunov # Purpose: Generate a container class with mutator/accessor methods -# The idea is to use this class as a base class in the -# inheritance hierarchy. This way we can evolve the base +# The idea is to use this class as a base class in the +# inheritance hierarchy. This way we can evolve the base # container independently from the rest of the code! # use strict; -die "Usage: $0 <module name> <field description file>\n" +die "Usage: $0 <module name> <field description file>\n" if not defined $ARGV[0]; -die "Usage: $0 <module name> <field description file>\n" +die "Usage: $0 <module name> <field description file>\n" if not defined $ARGV[1]; my $module_name = $ARGV[0]; diff --git a/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl b/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl index c44ce1b8796..9638e71f49f 100644 --- a/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl +++ b/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl @@ -34,16 +34,16 @@ module Components FeatureName name; }; - exception UnknownImplId - { + exception UnknownImplId + { }; - exception InvalidLocation - { + exception InvalidLocation + { }; - exception ImplEntryPointNotFound - { + exception ImplEntryPointNotFound + { }; exception InstallationFailure diff --git a/CIAO/ciao/Containers/CIAO_Servant_Activator.idl b/CIAO/ciao/Containers/CIAO_Servant_Activator.idl index 18aa906e0e2..6e725b5821c 100644 --- a/CIAO/ciao/Containers/CIAO_Servant_Activator.idl +++ b/CIAO/ciao/Containers/CIAO_Servant_Activator.idl @@ -1,4 +1,4 @@ -/** +/** * @file CIAO_Servant_Activator.idl * @author William R. Otte <wotte@dre.vanderbilt.edu> * $Id$ @@ -16,7 +16,7 @@ module CIAO local interface Servant_Activator : PortableServer::ServantActivator { boolean update_port_activator (in PortableServer::ObjectId oid); - + boolean register_port_activator (in Port_Activator pa); }; }; diff --git a/CIAO/ciao/Containers/Container_Base.idl b/CIAO/ciao/Containers/Container_Base.idl index d9683d5d985..9d704012146 100644 --- a/CIAO/ciao/Containers/Container_Base.idl +++ b/CIAO/ciao/Containers/Container_Base.idl @@ -52,7 +52,7 @@ module CIAO in string servant_artifact, in string servant_entrypoint, in string name); - + void set_attributes (in Object name, in Components::ConfigValues values); diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp index b1821dcd421..2283b2eabd4 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -89,7 +89,7 @@ namespace CIAO CLINFO "CIAO::Session_Container: Unable " "to initialize the POA.\n")); - + throw Components::CreateFailure (); } @@ -1038,7 +1038,7 @@ namespace CIAO CIAO_ERROR (1, (LM_EMERGENCY, "ex in ref to servant\n")); throw CIAO::InvalidComponent (); } - + if (!svt) { CIAO_ERROR (1, (LM_EMERGENCY, "invalid servant reference\n")); @@ -1057,7 +1057,7 @@ namespace CIAO "Session_Container::set_attributes - " "Configuring attribute values on " "component object reference.\n")); - + comp->set_attributes (values); } else if ((home = dynamic_cast <CIAO::Home_Servant_Impl_Base *> (svt.in ()))) @@ -1068,10 +1068,10 @@ namespace CIAO "Session_Container::set_attributes - " "Configuring attribute values on " "home object reference.\n")); - + home->set_attributes (values); } - else + else { CIAO_ERROR (1, (LM_EMERGENCY, "not home or component\n")); throw CIAO::InvalidComponent (); @@ -1123,7 +1123,7 @@ namespace CIAO CIAO::Connector_Servant_Impl_Base * svt = 0; PortableServer::ServantBase_var servant_from_reference; - + try { servant_from_reference = diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp index ac0ff2e7ff9..d91e0dc8a7e 100644 --- a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp +++ b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp @@ -7,14 +7,14 @@ namespace CIAO { - const char * - Deployment_Common::get_implementation (const char *name, + const char * + Deployment_Common::get_implementation (const char *name, const ::Deployment::DeploymentPlan &plan) { if (name == 0) throw ::Deployment::PlanError (name, "No such artifact"); - + for (CORBA::ULong i = 0; i < plan.artifact.length (); ++i) @@ -44,14 +44,14 @@ namespace CIAO throw ::Deployment::PlanError (name, "Nonexistant artifact"); return 0; - } - - void + } + + void Deployment_Common::create_attribute_configuration (const ::Deployment::Properties &props, ::Components::ConfigValues & values) { values.length (props.length ()); - + for (CORBA::ULong i = 0; i < props.length (); ++i) diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp index b2b5fb15df9..97c58878251 100644 --- a/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp +++ b/CIAO/ciao/Deployment/Handlers/CIAO_State.cpp @@ -14,12 +14,12 @@ namespace CIAO this->components_.clear (); } - void + void Deployment_State::add_container (const char *id, CIAO::Container_ptr container) { CIAO_TRACE ("Deployment_State::add_container"); - + if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. this->containers_.find (id) != this->containers_.end ()) { @@ -27,42 +27,42 @@ namespace CIAO "Deployment_State::add_container - " "Warning: Attempting to add duplicate container reference\n")); } - + this->containers_[id] = CIAO::Container::_duplicate (container); } - + void Deployment_State::remove_container (const char *id) { CIAO_TRACE ("Deployment_State::remove_container"); CONTAINERS::iterator pos = this->containers_.find (id); - + if (pos != this->containers_.end ()) this->containers_.erase (pos); } - + CIAO::Container_ptr Deployment_State::fetch_container (const char *id) { CIAO_TRACE ("Deployment_State::fetch_container"); - + CONTAINERS::iterator pos = this->containers_.find (id); - - if (pos == this->containers_.end ()) + + if (pos == this->containers_.end ()) { return CIAO::Container::_nil (); } - + return CIAO::Container::_duplicate (pos->second.in ()); } - void + void Deployment_State::add_home (const char *id, const char *cont_id, Components::CCMHome_ptr home) { CIAO_TRACE ("Deployment_State::add_home"); - + if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. this->homes_.find (id) != this->homes_.end ()) { @@ -70,46 +70,46 @@ namespace CIAO "Deployment_State::add_home - " "Warning: Attempting to add duplicate home reference\n")); } - + this->instance_container_[id] = cont_id; this->homes_[id] = Components::CCMHome::_duplicate (home); } - + void Deployment_State::remove_home (const char *id) { CIAO_TRACE ("Deployment_State::remove_home"); HOMES::iterator pos = this->homes_.find (id); - + if (pos != this->homes_.end ()) this->homes_.erase (pos); - - INSTANCE_CONTAINER::iterator cont = + + INSTANCE_CONTAINER::iterator cont = this->instance_container_.find (id); - + if (cont != this->instance_container_.end ()) this->instance_container_.erase (cont); } - + Components::CCMHome_ptr Deployment_State::fetch_home (const char *id) { CIAO_TRACE ("Deployment_State::fetch_home"); HOMES::iterator pos = this->homes_.find (id); - + if (pos == this->homes_.end ()) return Components::CCMHome::_nil (); - return Components::CCMHome::_duplicate (pos->second.in ()); + return Components::CCMHome::_duplicate (pos->second.in ()); } - - void + + void Deployment_State::add_component (const char *id, const char *cont_id, Components::CCMObject_ptr component) { CIAO_TRACE ("Deployment_State::add_component"); - + if (CIAO_debug_level && // Let's only perform this lookup if we have logging enabled. this->components_.find (id) != this->components_.end ()) { @@ -117,54 +117,54 @@ namespace CIAO "Deployment_State::add_component - " "Warning: Attempting to add duplicate component reference\n")); } - + this->instance_container_[id] = cont_id; this->components_[id] = Components::CCMObject::_duplicate (component); } - + void Deployment_State::remove_component (const char *id) { CIAO_TRACE ("Deployment_State::remove_component"); COMPONENTS::iterator pos = this->components_.find (id); - + if (pos != this->components_.end ()) this->components_.erase (pos); - - INSTANCE_CONTAINER::iterator cont = + + INSTANCE_CONTAINER::iterator cont = this->instance_container_.find (id); - + if (cont != this->instance_container_.end ()) this->instance_container_.erase (cont); } - + Components::CCMObject_ptr Deployment_State::fetch_component (const char *id) { CIAO_TRACE ("Deployment_State::fetch_component"); COMPONENTS::iterator pos = this->components_.find (id); - + if (pos == this->components_.end ()) { return Components::CCMObject::_nil (); } - - return Components::CCMObject::_duplicate (pos->second.in ()); + + return Components::CCMObject::_duplicate (pos->second.in ()); } - - const char * + + const char * Deployment_State::instance_to_container (const char *id) { CIAO_TRACE ("Deployment_State::instance_to_container"); - - INSTANCE_CONTAINER::const_iterator cont = + + INSTANCE_CONTAINER::const_iterator cont = this->instance_container_.find (id); - + if (cont != this->instance_container_.end ()) return cont->second.c_str (); - + CIAO_ERROR (1, (LM_ERROR, CLINFO "Deployment_State::instance_to_container - " "Error: Unknown instance ID <%C>\n", diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp index 96e128647dd..b0c6ae1247d 100644 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp @@ -13,13 +13,13 @@ namespace CIAO { CIAO_TRACE ("Component_Handler_i::Component_Handler_i"); } - - // Destructor + + // Destructor Component_Handler_i::~Component_Handler_i (void) { CIAO_TRACE ("Component_Handler_i::~Component_Handler_i"); } - + void Component_Handler_i::close (void) { @@ -33,20 +33,20 @@ namespace CIAO ACE_NEW_THROW_EX (retval, ::CORBA::StringSeq (1), CORBA::NO_MEMORY ()); - + retval->length (1); (*retval)[0] = CIAO::Deployment::CCM_CONTAINER; return retval; } - char * + char * Component_Handler_i::instance_type (void) { CIAO_TRACE ("Component_Handler_i::instance_type"); return CORBA::string_dup ("edu.dre.vanderbilt.dre.CCM.Component"); } - + void Component_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, ::CORBA::ULong instanceRef, @@ -56,33 +56,33 @@ namespace CIAO ACE_NEW_THROW_EX (retval, CORBA::Any (), CORBA::NO_MEMORY ()); - + instance_reference = retval; - + CIAO_TRACE ("Component_Handler_i::install_instance"); - + const ::Deployment::InstanceDeploymentDescription &idd (plan.instance[instanceRef]); const ::Deployment::MonolithicDeploymentDescription &mdd (plan.implementation[idd.implementationRef]); - + DAnCE::Utility::PROPERTY_MAP *pmap = 0; - + ACE_NEW_THROW_EX (pmap, DAnCE::Utility::PROPERTY_MAP (idd.configProperty.length () + mdd.execParameter.length ()), CORBA::NO_MEMORY ()); - + Deployment_Common::Instance_Info info; info.name = idd.name.in (); info.pmap.reset (pmap); - + DAnCE::Utility::build_property_map (*pmap, mdd.execParameter); DAnCE::Utility::build_property_map (*pmap, idd.configProperty); - + CORBA::String_var exec_art, exec_entry, svnt_art, svnt_entry, cont_id; - + using namespace CIAO::Deployment; CORBA::Any val; const char *tmp = 0; @@ -138,7 +138,7 @@ namespace CIAO throw ::Deployment::PlanError (idd.name.in (), "No executory artifact identified.\n"); } - + if (pmap->find (COMPONENT_FACTORY, val) == 0) { val >>= tmp; @@ -155,7 +155,7 @@ namespace CIAO throw ::Deployment::PlanError (idd.name.in (), "No executor entrypoint provided\n"); } - + if (pmap->find (CONTAINER_ID, val) == 0) { val >>= tmp; @@ -172,9 +172,9 @@ namespace CIAO idd.name.in ())); cont_id = ""; } - + ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - + if (CORBA::is_nil (container)) { CIAO_ERROR (1, (LM_INFO, CLINFO @@ -184,7 +184,7 @@ namespace CIAO throw ::Deployment::PlanError (idd.name.in (), "Invalid container\n"); } - + Components::CCMObject_var comp_ref; try @@ -194,11 +194,11 @@ namespace CIAO svnt_art, svnt_entry, idd.name.in ()); - + ::Components::ConfigValues attr_config; Deployment_Common::create_attribute_configuration (idd.configProperty, attr_config); - + container->set_attributes (comp_ref.in (), attr_config); } @@ -219,7 +219,7 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Unknown C++ exception\n"); } - + if (CORBA::is_nil (comp_ref)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -228,34 +228,34 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Container provided nil object reference"); } - + this->instances_[idd.name.in ()] = info; - + DEPLOYMENT_STATE::instance ()->add_component (idd.name.in (), cont_id, comp_ref.in ()); *instance_reference <<= comp_ref; } - + void Component_Handler_i::activate_instance (const ::Deployment::DeploymentPlan &plan, ::CORBA::ULong instanceRef, const ::CORBA::Any &) { CIAO_TRACE ("Component_Handler_i::activate_instance"); - + const char *name = plan.instance[instanceRef].name.in (); - const char *container = + const char *container = DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = + + CIAO::Container_var cont = DEPLOYMENT_STATE::instance ()->fetch_container (container); - + Components::CCMObject_var comp = DEPLOYMENT_STATE::instance ()->fetch_component (name); - + if (CORBA::is_nil (cont)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -265,7 +265,7 @@ namespace CIAO throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), "Unable to activate due to nil container reference"); } - + if (CORBA::is_nil (comp)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -307,15 +307,15 @@ namespace CIAO const ::CORBA::Any &) { CIAO_TRACE ("Component_Handler_i::passivate_instance"); - + const char *name = plan.instance[instanceRef].name.in (); - const char *container = + const char *container = DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = + + CIAO::Container_var cont = DEPLOYMENT_STATE::instance ()->fetch_container (container); - + Components::CCMObject_var comp = DEPLOYMENT_STATE::instance ()->fetch_component (name); @@ -328,7 +328,7 @@ namespace CIAO throw ::Deployment::StopError (plan.instance[instanceRef].name.in (), "Unable to activate due to nil container reference"); } - + if (CORBA::is_nil (comp)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -338,7 +338,7 @@ namespace CIAO throw ::Deployment::StopError (plan.instance[instanceRef].name.in (), "Unable to activate due to nil reference"); } - + try { cont->passivate_component (comp.in ()); @@ -363,36 +363,36 @@ namespace CIAO "Unknown C++ exception during passivation"); } } - + void Component_Handler_i::remove_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any &) { CIAO_TRACE ("Component_Handler_i::remove_instance"); - + const char *name = plan.instance[instanceRef].name.in (); Deployment_Common::INSTANCES::iterator instance = this->instances_.find (name); - + if (instance == this->instances_.end ()) { - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Component_Handler_i::remove_instance - " "Instructed to remove unknown component instance <%C>\n", name)); throw ::Deployment::StopError (name, "Wrong instance handler for component instance\n"); } - + CIAO_DEBUG (8, (LM_DEBUG, CLINFO "Component_Handler_i::remove_instance - " "Attempting removal of component instance <%C>\n", name)); - + CORBA::Any val; const char *cont_id = 0; - + if (instance->second.pmap->find (Deployment::CONTAINER_ID, val) == 0) { val >>= cont_id; @@ -410,7 +410,7 @@ namespace CIAO } ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - + if (CORBA::is_nil (container)) { CIAO_ERROR (1, (LM_INFO, CLINFO @@ -420,7 +420,7 @@ namespace CIAO throw ::Deployment::StopError (name, "Invalid container\n"); } - + try { Components::CCMObject_var ref @@ -448,40 +448,40 @@ namespace CIAO throw ::Deployment::StopError (name, "Unknown C++ exception\n"); } - + this->instances_.erase (instance); DEPLOYMENT_STATE::instance ()->remove_component (name); - + CIAO_DEBUG (4, (LM_INFO, CLINFO "Component_Handler_i::remove_instance - " "Instance <%C> successfully removed\n", name)); } - - void + + void Component_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::Any_out endpoint_reference) { CIAO_TRACE ("Component_Handler_i::provide_endpoint_reference"); - + DEPLOYMENT_STATE::instance ()->connection_handler.provide_endpoint_reference (plan, connectionRef, endpoint_reference); } - + void Component_Handler_i::connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference) { CIAO_TRACE ("Component_Handler_i::connect_instance"); - + DEPLOYMENT_STATE::instance ()->connection_handler.connect_instance (plan, connectionRef, provided_reference); } - + void Component_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef) @@ -489,7 +489,7 @@ namespace CIAO CIAO_TRACE ("Component_Handler_i::disconnect_instance"); DEPLOYMENT_STATE::instance ()->connection_handler.disconnect_instance (plan, connectionRef); - + } void @@ -497,10 +497,10 @@ namespace CIAO ::CORBA::ULong instanceRef) { CIAO_TRACE ("Component_Handler_i::instance_configured"); - - Components::CCMObject_var ref = + + Components::CCMObject_var ref = DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[instanceRef].name.in ()); - + if (CORBA::is_nil (ref)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -510,7 +510,7 @@ namespace CIAO throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), "Unable to configure due to nil reference"); } - + try { ref->configuration_complete (); @@ -531,21 +531,21 @@ namespace CIAO "Caught C++ Exception\n")); throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), "Unknown C++ exception"); - + } - + } - + void Component_Handler_i::configure (const ::Deployment::Properties & ) { - + } } extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Component_Handler (void) { return new CIAO::Component_Handler_i (); diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp index fca844a3fe6..e8bfacf5131 100644 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp @@ -5,16 +5,16 @@ #include "CIAO_State.h" namespace CIAO { - void + void Connection_Handler::provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::Any_out endpoint_reference) { CIAO_TRACE ("Component_Handler_i::provide_endpoint_reference"); - - const ::Deployment::PlanConnectionDescription &conn = + + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; - + try { CIAO_DEBUG (9, (LM_TRACE, CLINFO @@ -31,13 +31,13 @@ namespace CIAO CORBA::Any *out; CORBA::Object_var ref; CORBA::ULong instanceRef = conn.internalEndpoint[i].instanceRef; - Components::CCMObject_var comp = + Components::CCMObject_var comp = DEPLOYMENT_STATE::instance ()-> fetch_component (plan.instance[instanceRef].name.in ()); - + if (CORBA::is_nil (comp.in ())) { - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::provide_endpoint_reference - " "Nil component reference from CIAO_State for <%C>\n", plan.instance[instanceRef].name.in ())); @@ -45,13 +45,13 @@ namespace CIAO "Component instance not deployed when " "gathering connections."); } - + ACE_NEW_THROW_EX (out, CORBA::Any (), CORBA::NO_MEMORY ()); - + endpoint_reference = out; - + if (this->is_local_facet (conn)) (*out) <<= comp.in (); else @@ -59,17 +59,17 @@ namespace CIAO switch (conn.internalEndpoint[i].kind) { case ::Deployment::Facet: - ref = + ref = comp->provide_facet (conn.internalEndpoint[i].portName.in ()); (*out) <<= ref.in (); break; - + case ::Deployment::EventConsumer: - ref = + ref = comp->get_consumer (conn.internalEndpoint[i].portName.in ()); (*out) <<= ref.in (); break; - + default: throw ::Deployment::InvalidConnection (conn.name.in (), "Invalid provider port type."); @@ -86,7 +86,7 @@ namespace CIAO } catch (const CORBA::Exception &ex) { - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::provide_endpoint_reference - " "Caught CORBA Exception <%C> while fetching reference for " "connection <%C>\n", @@ -94,11 +94,11 @@ namespace CIAO plan.connection[connectionRef].name.in ())); throw ::Deployment::InvalidConnection (plan.connection[connectionRef].name.in (), ex._info ().c_str ()); - + } catch (...) { - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::provide_endpoint_reference - " "Caught unknown C++ exception on instance %C", plan.connection[connectionRef].name.in ())); @@ -106,7 +106,7 @@ namespace CIAO "Unknown C++ exception whilst establishing " "connection"); } - + } void @@ -115,7 +115,7 @@ namespace CIAO const ::CORBA::Any & provided_reference) { CIAO_TRACE ("Connection_Handler::connect_instance"); - + const ::Deployment::PlanConnectionDescription &conn = plan.connection[c_id]; const char *name = conn.name.in (); @@ -128,9 +128,9 @@ namespace CIAO throw ::Deployment::InvalidConnection (name, "No internal endpoint for connection\n"); } - + CORBA::ULong endpoint (0); - + if (conn.internalEndpoint.length () > 1) { for (CORBA::ULong i = 0; @@ -141,7 +141,7 @@ namespace CIAO endpoint = i; } } - + try { switch (conn.internalEndpoint[endpoint].kind) @@ -166,14 +166,14 @@ namespace CIAO case Deployment::EventConsumer: this->connect_consumer (plan, c_id, endpoint, provided_reference); break; - + default: CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::connect_instance - " "Unsupported port type.\n")); throw ::Deployment::InvalidConnection (name, "Unsupported port type"); - + } } catch (const ::Deployment::InvalidConnection &) @@ -201,7 +201,7 @@ namespace CIAO "Unknown C++ Exception"); } } - + void Connection_Handler::disconnect_instance (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) @@ -209,7 +209,7 @@ namespace CIAO CIAO_TRACE ("Connection_Handler::disconnect_instance"); // no-op is current behavior, we'll do that for now. } - + void Connection_Handler::connect_facet (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, @@ -217,26 +217,26 @@ namespace CIAO const ::CORBA::Any & provided_reference) { CIAO_TRACE ("Connection_Handler::connect_facet"); - - const ::Deployment::PlanConnectionDescription &conn = + + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = conn.internalEndpoint[endpointRef]; - + CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Connection_Handler::connect_facet - " "Connecting connection <%C> on instance <%C>\n", conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - + if (this->is_local_facet (conn)) { CORBA::ULong other_endpointRef = (endpointRef + 1) % 2; - if (conn.internalEndpoint.length () == 2 && + if (conn.internalEndpoint.length () == 2 && (conn.internalEndpoint[other_endpointRef].kind == ::Deployment::MultiplexReceptacle || conn.internalEndpoint[other_endpointRef].kind == ::Deployment::SimplexReceptacle)) { - const ::Deployment::PlanSubcomponentPortEndpoint &other_endpoint = + const ::Deployment::PlanSubcomponentPortEndpoint &other_endpoint = conn.internalEndpoint[other_endpointRef]; this->connect_local_port (plan.instance[endpoint.instanceRef].name.in (), endpoint.portName.in (), @@ -256,7 +256,7 @@ namespace CIAO "Local facet connections require exactly 2 internalEndpoints"); } } - + if (conn.externalReference.length () == 0) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -269,7 +269,7 @@ namespace CIAO ::CORBA::Object_var obj; provided_reference >>= CORBA::Any::to_object (obj); - + ::Components::CCMObject_var provided = ::Components::CCMObject::_narrow (obj.in ()); if (CORBA::is_nil (provided)) @@ -283,12 +283,12 @@ namespace CIAO throw ::Deployment::InvalidConnection (plan.connection[connectionRef].name.in (), "Provided reference for connection where primary is Facet must " "be non-nil."); - + } - - ::Components::CCMObject_var facet_provider = + + ::Components::CCMObject_var facet_provider = DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - + if (CORBA::is_nil (facet_provider)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -299,46 +299,46 @@ namespace CIAO throw ::Deployment::InvalidConnection (plan.connection[connectionRef].name.in (), "Providing component not deployed."); } - - CORBA::Object_var facet = + + CORBA::Object_var facet = facet_provider->provide_facet (endpoint.portName.in ()); - + ::Components::Cookie_var cookie = provided->connect (conn.externalReference[0].portName.in (), facet.in ()); - + CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_facet - " "Connection <%C> successfully established.\n", conn.name.in ())); - + this->cookies_[conn.name.in ()] = CONNECTION_INFO (cookie, ::Components::CCMObject::_duplicate (provided)); } - - void + + void Connection_Handler::connect_receptacle (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpointRef, const ::CORBA::Any & provided_reference) { - const ::Deployment::PlanConnectionDescription &conn = + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = conn.internalEndpoint[endpointRef]; - + CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Connection_Handler::connect_receptacle - " "Connecting connection <%C> on instance <%C>\n", conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - + if (this->is_local_facet (conn)) { CORBA::ULong other_endpointRef = (endpointRef + 1) % 2; - if (conn.internalEndpoint.length () == 2 && + if (conn.internalEndpoint.length () == 2 && (conn.internalEndpoint[other_endpointRef].kind == ::Deployment::Facet)) { - const ::Deployment::PlanSubcomponentPortEndpoint &other_endpoint = + const ::Deployment::PlanSubcomponentPortEndpoint &other_endpoint = conn.internalEndpoint[other_endpointRef]; this->connect_local_port (plan.instance[other_endpoint.instanceRef].name.in (), other_endpoint.portName.in (), @@ -357,7 +357,7 @@ namespace CIAO "Local receptacle connections require exactly 2 internalEndpoints"); } } - + ::CORBA::Object_var provided; if (!(provided_reference >>= CORBA::Any::to_object (provided))) @@ -369,14 +369,14 @@ namespace CIAO throw ::Deployment::InvalidConnection (plan.connection[connectionRef].name.in (), "Unable to extract provided reference to CORBA Object."); } - + if (conn.externalReference.length () != 0) { if (ACE_OS::strlen (conn.externalReference[0].portName.in ()) > 0) { - ::Components::CCMObject_var facet_provider = + ::Components::CCMObject_var facet_provider = ::Components::CCMObject::_narrow (provided.in ()); - + if (CORBA::is_nil (facet_provider.in ())) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -388,15 +388,15 @@ namespace CIAO throw ::Deployment::InvalidConnection (conn.name.in (), "Unable to narrow external reference to CCMObject\n"); } - - provided = + + provided = facet_provider->provide_facet (conn.externalReference[0].portName.in ()); } } - - ::Components::CCMObject_var receptacle = + + ::Components::CCMObject_var receptacle = DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - + if (CORBA::is_nil (receptacle)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -408,37 +408,37 @@ namespace CIAO throw ::Deployment::InvalidConnection (plan.connection[connectionRef].name.in (), "Receptacle component not deployed."); } - + ::Components::Cookie_var cookie = receptacle->connect (endpoint.portName.in (), provided.in ()); CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_receptacle - " "Connection <%C> successfully established.\n", conn.name.in ())); - + this->cookies_[conn.name.in ()] = CONNECTION_INFO (cookie, ::Components::CCMObject::_duplicate (receptacle.in ())); } - - void + + void Connection_Handler::connect_publisher (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpointRef, const ::CORBA::Any & provided_reference) { CIAO_TRACE ("Connection_Handler::connect_publisher"); - - const ::Deployment::PlanConnectionDescription &conn = + + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = conn.internalEndpoint[endpointRef]; - + CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Connection_Handler::connect_publisher - " "Connecting connection <%C> on instance <%C>\n", conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - + ::CORBA::Object_var consumer; if (!(provided_reference >>= CORBA::Any::to_object (consumer)) || @@ -452,12 +452,12 @@ namespace CIAO "Unable to extract provided reference to CORBA Object."); } - Components::EventConsumerBase_var event = + Components::EventConsumerBase_var event = Components::EventConsumerBase::_unchecked_narrow (consumer); - - ::Components::CCMObject_var publisher = + + ::Components::CCMObject_var publisher = DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - + if (CORBA::is_nil (publisher)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -468,62 +468,62 @@ namespace CIAO throw ::Deployment::InvalidConnection (conn.name.in (), "Publisher component not deployed."); } - + Components::Cookie_var cookie = publisher->subscribe (endpoint.portName.in (), event.in ()); - + CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_publisher - " "Connection <%C> successfully established.\n", conn.name.in ())); - + this->cookies_[conn.name.in ()] = CONNECTION_INFO (cookie, ::Components::CCMObject::_duplicate (publisher.in ())); } - - void + + void Connection_Handler::connect_consumer (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpointRef, const ::CORBA::Any &) { CIAO_TRACE ("Connection_Handler::connect_subscriber"); - - const ::Deployment::PlanConnectionDescription &conn = + + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = conn.internalEndpoint[endpointRef]; - + CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Connection_Handler::connect_consumer - " "Connecting connection <%C> on instance <%C>\n", conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - + throw ::Deployment::InvalidConnection (conn.name.in (), "ExternalReference connection of consumers " "currently unsupported.\n"); } - void + void Connection_Handler::connect_emitter (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::ULong endpointRef, const ::CORBA::Any & provided_reference) { CIAO_TRACE ("Connection_Handler::connect_emitter"); - - const ::Deployment::PlanConnectionDescription &conn = + + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; - const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = conn.internalEndpoint[endpointRef]; - + CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Connection_Handler::connect_emitter - " "Connecting connection <%C> on instance <%C>\n", conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - + ::CORBA::Object_var consumer; if (!(provided_reference >>= CORBA::Any::to_object (consumer)) || @@ -537,12 +537,12 @@ namespace CIAO "Unable to extract provided reference to CORBA Object."); } - Components::EventConsumerBase_var event = + Components::EventConsumerBase_var event = Components::EventConsumerBase::_unchecked_narrow (consumer); - - ::Components::CCMObject_var emitter = + + ::Components::CCMObject_var emitter = DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - + if (CORBA::is_nil (emitter)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -553,53 +553,53 @@ namespace CIAO throw ::Deployment::InvalidConnection (conn.name.in (), "Emitting component not deployed."); } - + emitter->connect_consumer (endpoint.portName.in (), event.in ()); - + CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_emitter - " "Connection <%C> successfully established.\n", conn.name.in ())); - + ::Components::Cookie_var nil_cookie; this->cookies_[conn.name.in ()] = CONNECTION_INFO (nil_cookie, - ::Components::CCMObject::_duplicate (emitter.in ())); + ::Components::CCMObject::_duplicate (emitter.in ())); } - + void Connection_Handler::disconnect_facet (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) - + { CIAO_TRACE ("Connection_Handler::disconnect_facet"); } - - void + + void Connection_Handler::disconnect_receptacle (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) - + { CIAO_TRACE ("Connection_Handler::disconnect_receptacle"); } - - void + + void Connection_Handler::disconnect_publisher (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) - + { CIAO_TRACE ("Connection_Handler::disconnect_publisher"); } - - void + + void Connection_Handler::disconnect_subscriber (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) - + { CIAO_TRACE ("Connection_Handler::disconnect_subscriber"); } - + void Connection_Handler::connect_local_port (const char *facet_id, const char *facet_port, @@ -607,12 +607,12 @@ namespace CIAO const char *receptacle_port) { CIAO_TRACE ("Connection_Handler::connect_local_port"); - - const char *facet_cont = + + const char *facet_cont = DEPLOYMENT_STATE::instance ()->instance_to_container (facet_id); - const char *recep_cont = + const char *recep_cont = DEPLOYMENT_STATE::instance ()->instance_to_container (receptacle_id); - + if (facet_cont && recep_cont && ACE_OS::strcmp (facet_cont, recep_cont) != 0) { @@ -628,14 +628,14 @@ namespace CIAO "Component instance participates in a local connection with " "a non-local entity."); } - - CIAO::Container_var cont = + + CIAO::Container_var cont = DEPLOYMENT_STATE::instance ()->fetch_container (facet_cont); - - Components::CCMObject_var + + Components::CCMObject_var facet = DEPLOYMENT_STATE::instance ()->fetch_component (facet_id), receptacle = DEPLOYMENT_STATE::instance ()->fetch_component (receptacle_id); - + cont->connect_local_facet (facet, facet_port, receptacle, @@ -646,7 +646,7 @@ namespace CIAO facet_id, facet_port, receptacle_id, receptacle_port)); } - + bool Connection_Handler::is_local_facet (const ::Deployment::PlanConnectionDescription &conn) { @@ -660,6 +660,6 @@ namespace CIAO return true; } } - return false; + return false; } } diff --git a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp index 12bb407ebcd..6feffcade70 100644 --- a/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Container_Handler.cpp @@ -17,25 +17,25 @@ namespace CIAO // Also initialize CIAO logger since we reuse parts of CIAO in the locality manager CIAO::Logger_Service * clf = ACE_Dynamic_Service<CIAO::Logger_Service>::instance ("CIAO_Logger"); - + int argc (0); char **argv (0); - + if (clf) { clf->init (argc, argv); } - + CIAO_TRACE ("Container_Handler_i::Container_Handler_i"); } - - // Destructor + + // Destructor Container_Handler_i::~Container_Handler_i (void) { CIAO_TRACE ("Container_Handler_i::~Container_Handler_i"); } - + void Container_Handler_i::close (void) { @@ -46,7 +46,7 @@ namespace CIAO ::Deployment::DeploymentPlan plan; plan.instance.length (1); plan.instance[0].name = ""; - + CORBA::Any any; this->remove_instance (plan, 0, any); } @@ -56,7 +56,7 @@ namespace CIAO DEPLOYMENT_STATE::instance ()->close (); DEPLOYMENT_STATE::close (); - + this->orb_ = CORBA::ORB::_nil (); this->poa_ = PortableServer::POA::_nil (); } @@ -68,17 +68,17 @@ namespace CIAO ACE_NEW_THROW_EX (retval, ::CORBA::StringSeq (0), CORBA::NO_MEMORY ()); - + return retval; } - char * + char * Container_Handler_i::instance_type (void) { CIAO_TRACE ("Container_Handler_i::instance_type"); return CORBA::string_dup ("edu.dre.vanderbilt.dre.DAnCE.CCM.Container"); } - + void Container_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, ::CORBA::ULong instanceRef, @@ -90,14 +90,14 @@ namespace CIAO ACE_NEW_THROW_EX (outref, ::CORBA::Any (), CORBA::NO_MEMORY ()); - + instance_reference = outref; - + CIAO::Session_Container *cont (0); const char *name (plan.instance[instanceRef].name.in ()); CORBA::PolicyList policies (0); - - CIAO_DEBUG (6, (LM_DEBUG, CLINFO + + CIAO_DEBUG (6, (LM_DEBUG, CLINFO "Container_Handler_i::install_instance - " "Creating container with id <%C>\n", name)); @@ -110,8 +110,8 @@ namespace CIAO name, 0 /* no additional policies at this moment */), CORBA::NO_MEMORY ()); - - CIAO_DEBUG (8, (LM_DEBUG, CLINFO + + CIAO_DEBUG (8, (LM_DEBUG, CLINFO "Container_Handler_i::install_instance - " "Container <%C> successfully created\n", name)); @@ -119,12 +119,12 @@ namespace CIAO CIAO::Container_var container_ref (cont); DEPLOYMENT_STATE::instance ()->add_container (name, cont); - + (*outref) <<= container_ref; - + *instance_reference <<= container_ref; } - + void Container_Handler_i::activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -142,14 +142,14 @@ namespace CIAO CIAO_TRACE ("Container_Handler_i::passivate_instance"); // no passivation needed. } - - void + + void Container_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) { CIAO_TRACE ("Container_Handler_i::provide_endpoint_reference"); - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Container_Handler_i::provide_endpoint_reference - " "Unable to provide any endpoints.\n")); throw CORBA::NO_IMPLEMENT (); @@ -162,12 +162,12 @@ namespace CIAO const ::CORBA::Any &) { CIAO_TRACE ("Container_Handler_i::remove_instance"); - + const char *name = plan.instance[instanceRef].name.in (); - ::CIAO::Container_var cont = + ::CIAO::Container_var cont = DEPLOYMENT_STATE::instance ()->fetch_container (name); - + if (::CORBA::is_nil (cont.in ())) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -177,47 +177,47 @@ namespace CIAO throw ::Deployment::StopError (name, "No container with ID"); } - - + + CIAO_DEBUG (8, (LM_TRACE, CLINFO "Container_Handler_i::remove_instance - " "Removing container with Id <%C>\n", name)); - + DEPLOYMENT_STATE::instance ()->remove_container (name); - + CIAO_DEBUG (5, (LM_TRACE, CLINFO "Container_Handler_i::remove_instance - " "Container with Id <%C> removed.\n", name)); } - + void Container_Handler_i::connect_instance (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, const ::CORBA::Any &) { CIAO_TRACE ("Container_Handler_i::connect_instance"); - + CIAO_ERROR (1, (LM_ERROR, CLINFO "Container_Handler_i::connect_instance - ", "No connections allowed for containers.\n")); throw CORBA::NO_IMPLEMENT (); } - - + + void Container_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) { CIAO_TRACE ("Container_Handler_i::disconnect_instance"); - + CIAO_ERROR (1, (LM_ERROR, CLINFO "Container_Handler_i::disconnect_instance - ", "No connections allowed for containers.\n")); throw CORBA::NO_IMPLEMENT (); } - + void Container_Handler_i::instance_configured (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) @@ -235,7 +235,7 @@ namespace CIAO props.length ())); this->orb_ = DAnCE::PLUGIN_MANAGER::instance ()->get_orb (); - + if (CORBA::is_nil (this->orb_)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -244,11 +244,11 @@ namespace CIAO throw ::Deployment::StartError ("CIAO Container Handler ", "Unable to locate ORB"); } - + CORBA::Object_var object = this->orb_->resolve_initial_references ("RootPOA"); - this->poa_ = + this->poa_ = PortableServer::POA::_narrow (object.in ()); if (CORBA::is_nil (this->poa_)) @@ -259,15 +259,15 @@ namespace CIAO throw ::Deployment::StartError ("CIAO Container Handler ", "Unable to locate POA"); } - + CIAO::Server_init (orb_); - + // For the time being, we are going to go ahead and construct a container. ::Deployment::DeploymentPlan plan; plan.instance.length (1); plan.instance[0].name = ""; - + ::CORBA::Any_var any; this->install_instance (plan, 0, any.out ()); } @@ -275,7 +275,7 @@ namespace CIAO extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Container_Handler (void) { return new CIAO::Container_Handler_i (); diff --git a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp index b2d6d116456..cc06e80320d 100644 --- a/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Home_Handler.cpp @@ -12,13 +12,13 @@ namespace CIAO { CIAO_TRACE ("Home_Handler_i::Home_Handler_i"); } - - // Destructor + + // Destructor Home_Handler_i::~Home_Handler_i (void) { CIAO_TRACE ("Home_Handler_i::~Home_Handler_i"); } - + void Home_Handler_i::close (void) { this->instances_.clear (); @@ -31,43 +31,43 @@ namespace CIAO ACE_NEW_THROW_EX (retval, ::CORBA::StringSeq (1), CORBA::NO_MEMORY ()); - + retval->length (1); (*retval)[0] = CIAO::Deployment::CCM_CONTAINER; return retval; } - char * + char * Home_Handler_i::instance_type (void) { CIAO_TRACE ("Home_Handler_i::instance_type"); return CORBA::string_dup ("edu.dre.vanderbilt.dre.CCM.Home"); } - + void Home_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference) { CIAO_TRACE ("Home_Handler_i::install_instance"); - + ::CORBA::Any *retval_tmp = 0; ACE_NEW_THROW_EX (retval_tmp, CORBA::Any (), CORBA::NO_MEMORY ()); instance_reference = retval_tmp; - + const ::Deployment::InstanceDeploymentDescription &idd (plan.instance[instanceRef]); const ::Deployment::MonolithicDeploymentDescription &mdd (plan.implementation[idd.implementationRef]); - + DAnCE::Utility::PROPERTY_MAP *pmap = 0; - + ACE_NEW_THROW_EX (pmap, DAnCE::Utility::PROPERTY_MAP (idd.configProperty.length () + mdd.execParameter.length ()), CORBA::NO_MEMORY ()); - + Deployment_Common::Instance_Info info; info.name = idd.name.in (); info.pmap.reset (pmap); @@ -76,13 +76,13 @@ namespace CIAO mdd.execParameter); DAnCE::Utility::build_property_map (*pmap, idd.configProperty); - + CORBA::String_var exec_art, exec_entry, svnt_art, svnt_entry, cont_id; - + using namespace CIAO::Deployment; CORBA::Any val; const char *tmp = 0; - + if ((pmap->find (SVNT_ENTRYPT, val)) == 0) { val >>= tmp; @@ -135,7 +135,7 @@ namespace CIAO throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), "No executory artifact identified.\n"); } - + if (pmap->find (HOME_FACTORY, val) == 0) { val >>= tmp; @@ -152,7 +152,7 @@ namespace CIAO throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), "No executor entrypoint provided\n"); } - + if (pmap->find (CONTAINER_ID, val) == 0) { val >>= tmp; @@ -169,9 +169,9 @@ namespace CIAO idd.name.in ())); cont_id = ""; } - + ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - + if (CORBA::is_nil (container)) { CIAO_ERROR (1, (LM_INFO, CLINFO @@ -181,9 +181,9 @@ namespace CIAO throw ::Deployment::InvalidComponentExecParameter (idd.name.in (), "Invalid container\n"); } - + Components::CCMHome_var home_ref; - + try { home_ref = container->install_home (exec_art, @@ -195,7 +195,7 @@ namespace CIAO ::Components::ConfigValues attr_config; Deployment_Common::create_attribute_configuration (idd.configProperty, attr_config); - + container->set_attributes (home_ref.in (), attr_config); } catch (::CORBA::Exception &ex) @@ -215,7 +215,7 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Unknown C++ exception\n"); } - + if (CORBA::is_nil (home_ref)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -224,16 +224,16 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Container provided nil object reference"); } - + this->instances_[idd.name.in ()] = info; DEPLOYMENT_STATE::instance ()->add_home (idd.name.in (), cont_id, home_ref.in ()); - + *instance_reference <<= home_ref; } - - + + void Home_Handler_i::activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -251,36 +251,36 @@ namespace CIAO CIAO_TRACE ("Home_Handler_i::passivate_instance"); // no passivation needed. } - + void Home_Handler_i::remove_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any &) { CIAO_TRACE ("Home_Handler_i::remove_instance"); - + const char *name = plan.instance[instanceRef].name.in (); Deployment_Common::INSTANCES::iterator instance = this->instances_.find (name); - + if (instance == this->instances_.end ()) { - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Home_Handler_i::remove_instance - " "Instructed to remove unknown home instance <%C>\n", name)); throw ::Deployment::StopError (name, "Wrong instance handler for home instance\n"); } - + CIAO_DEBUG (8, (LM_DEBUG, CLINFO "Home_Handler_i::remove_instance - " "Attempting removal of home instance <%C>\n", name)); - + CORBA::Any val; const char *cont_id = 0; - + if (instance->second.pmap->find (Deployment::CONTAINER_ID, val) == 0) { val >>= cont_id; @@ -299,7 +299,7 @@ namespace CIAO ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - + if (CORBA::is_nil (container)) { CIAO_ERROR (1, (LM_INFO, CLINFO @@ -309,9 +309,9 @@ namespace CIAO throw ::Deployment::StopError (name, "Invalid container\n"); } - + Components::CCMHome_var ref - = DEPLOYMENT_STATE::instance ()->fetch_home (name); + = DEPLOYMENT_STATE::instance ()->fetch_home (name); try { @@ -334,27 +334,27 @@ namespace CIAO throw ::Deployment::StopError (name, "Unknown C++ exception\n"); } - + this->instances_.erase (instance); - + CIAO_DEBUG (4, (LM_INFO, CLINFO "Home_Handler_i::remove_instance - " "Instance <%C> successfully removed\n", name)); } - void + void Home_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) { CIAO_TRACE ("Home_Handler_i::provide_endpoint_reference"); - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Home_Handler_i::provide_endpoint_reference - " "Unable to provide any endpoints.\n")); throw CORBA::NO_IMPLEMENT (); } - + void Home_Handler_i::connect_instance (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, @@ -366,8 +366,8 @@ namespace CIAO "No connections allowed for homes.\n")); throw CORBA::NO_IMPLEMENT (); } - - + + void Home_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) @@ -378,8 +378,8 @@ namespace CIAO "No connections allowed for homes.\n")); throw CORBA::NO_IMPLEMENT (); } - - + + void Home_Handler_i::instance_configured (const ::Deployment::DeploymentPlan &, ::CORBA::ULong) @@ -391,13 +391,13 @@ namespace CIAO void Home_Handler_i::configure ( const ::Deployment::Properties&) { - + } } extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Home_Handler (void) { return new CIAO::Home_Handler_i (); diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp index 61c4eaf6e6b..6cb00753e2f 100644 --- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp @@ -14,13 +14,13 @@ namespace CIAO { CIAO_TRACE ("Homed_Component_Handler_i::Homed_Component_Handler_i"); } - - // Destructor + + // Destructor Homed_Component_Handler_i::~Homed_Component_Handler_i (void) { CIAO_TRACE ("Homed_Component_Handler_i::~Homed_Component_Handler_i"); } - + void Homed_Component_Handler_i::close (void) { @@ -34,20 +34,20 @@ namespace CIAO ACE_NEW_THROW_EX (retval, ::CORBA::StringSeq (1), CORBA::NO_MEMORY ()); - + retval->length (1); (*retval)[0] = CIAO::Deployment::CCM_HOME; return retval; } - char * + char * Homed_Component_Handler_i::instance_type (void) { CIAO_TRACE ("Homed_Component_Handler_i::instance_type"); return CORBA::string_dup ("edu.vanderbilt.dre.CCM.HomedComponent"); } - + void Homed_Component_Handler_i::install_instance (const ::Deployment::DeploymentPlan &plan, ::CORBA::ULong instanceRef, @@ -59,34 +59,34 @@ namespace CIAO ACE_NEW_THROW_EX (any, CORBA::Any (), CORBA::NO_MEMORY ()); - + instance_reference = any; - + const ::Deployment::InstanceDeploymentDescription &idd (plan.instance[instanceRef]); const ::Deployment::MonolithicDeploymentDescription &mdd (plan.implementation[idd.implementationRef]); - + CIAO_DEBUG (7, (LM_DEBUG, CLINFO "Homed_Component_Handler_i::install_instance - " "Starting deployment of <%C>\n", plan.instance[instanceRef].name.in ())); DAnCE::Utility::PROPERTY_MAP *pmap; - + ACE_NEW_THROW_EX (pmap, DAnCE::Utility::PROPERTY_MAP (idd.configProperty.length () + mdd.execParameter.length ()), CORBA::NO_MEMORY ()); - + Deployment_Common::Instance_Info info; info.name = idd.name.in (); info.pmap.reset (pmap); - - + + DAnCE::Utility::build_property_map (*pmap, mdd.execParameter); DAnCE::Utility::build_property_map (*pmap, idd.configProperty); - - + + using namespace CIAO::Deployment; CORBA::Any val; const char *tmp = 0; @@ -108,7 +108,7 @@ namespace CIAO } Components::CCMHome_var tmp_home = DEPLOYMENT_STATE::instance ()->fetch_home (tmp); - + Components::KeylessCCMHome_var home = Components::KeylessCCMHome::_narrow (tmp_home); if (CORBA::is_nil (home)) { @@ -119,22 +119,22 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Home ID is not available"); } - - const char *cont_id = + + const char *cont_id = DEPLOYMENT_STATE::instance ()->instance_to_container (tmp); - + ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); Components::CCMObject_var ref; try { ref = home->create_component (); - + ::Components::ConfigValues attr_config; Deployment_Common::create_attribute_configuration (idd.configProperty, attr_config); - - + + container->set_attributes (ref.in (), attr_config); } @@ -157,7 +157,7 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Unknown C++ exception"); } - + if (CORBA::is_nil (ref.in ())) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -169,18 +169,18 @@ namespace CIAO throw ::Deployment::StartError (idd.name.in (), "Nil reference from home on create"); } - - + + CIAO_DEBUG (4, (LM_INFO, CLINFO "Homed_Component_Handler_i::install_instance - " "Successfully created component <%C>\n", idd.name.in ())); - + this->instances_[idd.name.in ()] = info; - + DEPLOYMENT_STATE::instance ()->add_component (idd.name.in (), cont_id, - ref.in ()); + ref.in ()); (*instance_reference) <<= ref; } @@ -190,22 +190,22 @@ namespace CIAO const ::CORBA::Any &) { CIAO_TRACE ("Homed_Component_Handler_i::activate_instance"); - + const char *name = plan.instance[instanceRef].name.in (); - + CIAO_DEBUG (8, (LM_TRACE, CLINFO "Homed_Component_Handler_i::activate_instance - " "Starting activation of component instance <%C>\n", name)); - const char *container = + const char *container = DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = + + CIAO::Container_var cont = DEPLOYMENT_STATE::instance ()->fetch_container (container); - + Components::CCMObject_var comp = DEPLOYMENT_STATE::instance ()->fetch_component (name); - + try { cont->activate_component (comp.in ()); @@ -237,22 +237,22 @@ namespace CIAO const ::CORBA::Any &) { CIAO_TRACE ("Homed_Component_Handler_i::passivate_instance"); - + const char *name = plan.instance[instanceRef].name.in (); - + CIAO_DEBUG (8, (LM_TRACE, CLINFO "Homed_Component_Handler_i::passivate_instance - " "Starting passivation of component instance <%C>\n", name)); - const char *container = + const char *container = DEPLOYMENT_STATE::instance ()->instance_to_container (name); - - CIAO::Container_var cont = + + CIAO::Container_var cont = DEPLOYMENT_STATE::instance ()->fetch_container (container); - + Components::CCMObject_var comp = DEPLOYMENT_STATE::instance ()->fetch_component (name); - + try { cont->passivate_component (comp.in ()); @@ -277,33 +277,33 @@ namespace CIAO "Unknown C++ exception during passivation"); } } - + void Homed_Component_Handler_i::remove_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any &) { CIAO_TRACE ("Homed_Component_Handler_i::remove_instance"); - + const char *name = plan.instance[instanceRef].name.in (); Deployment_Common::INSTANCES::iterator instance = this->instances_.find (name); - + if (instance == this->instances_.end ()) { - CIAO_ERROR (1, (LM_ERROR, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "Homed_Component_Handler_i::remove_instance - " "Instructed to remove unknown homed component instance <%C>\n", name)); throw ::Deployment::StopError (name, "Wrong instance handler for homed component instance\n"); } - + CIAO_DEBUG (8, (LM_DEBUG, CLINFO "Homed_Component_Handler_i::remove_instance - " "Attempting removal of homed component instance <%C>\n", name)); - + using namespace CIAO::Deployment; CORBA::Any val; const char *tmp = 0; @@ -325,7 +325,7 @@ namespace CIAO } Components::CCMHome_var home = DEPLOYMENT_STATE::instance ()->fetch_home (tmp); - + if (CORBA::is_nil (home)) { CIAO_ERROR (1, (LM_ERROR, CLINFO @@ -335,7 +335,7 @@ namespace CIAO throw ::Deployment::StopError (name, "Home ID is not available"); } - + Components::CCMObject_var ref = DEPLOYMENT_STATE::instance ()->fetch_component (name); @@ -362,41 +362,41 @@ namespace CIAO throw ::Deployment::StopError (name, "Unknown C++ exception"); } - + CIAO_DEBUG (4, (LM_INFO, CLINFO "Homed_Component_Handler_i::remove_instance - " "Component <%C> successfully removed\n", name)); - + this->instances_.erase (instance); - + DEPLOYMENT_STATE::instance ()->remove_component (name); } - - void + + void Homed_Component_Handler_i::provide_endpoint_reference (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, ::CORBA::Any_out endpoint_reference) { CIAO_TRACE ("Homed_Component_Handler_i::provide_endpoint_reference"); - + DEPLOYMENT_STATE::instance ()->connection_handler.provide_endpoint_reference (plan, connectionRef, endpoint_reference); } - + void Homed_Component_Handler_i::connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference) { CIAO_TRACE ("Homed_Component_Handler_i::connect_instance"); - + DEPLOYMENT_STATE::instance ()->connection_handler.connect_instance (plan, connectionRef, provided_reference); } - - + + void Homed_Component_Handler_i::disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef) @@ -405,16 +405,16 @@ namespace CIAO DEPLOYMENT_STATE::instance ()->connection_handler.disconnect_instance (plan, connectionRef); } - + void Homed_Component_Handler_i::instance_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef) { CIAO_TRACE ("Homed_Component_Handler_i::instance_configured"); - - Components::CCMObject_var ref = + + Components::CCMObject_var ref = DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[instanceRef].name.in ()); - + try { ref->configuration_complete (); @@ -435,20 +435,20 @@ namespace CIAO "Caught C++ Exception\n")); throw ::Deployment::StartError (plan.instance[instanceRef].name.in (), "Unknown C++ exception\n"); - - } + + } } void Homed_Component_Handler_i::configure (const ::Deployment::Properties&) { - + } } extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr CIAO_Locality_Handler_Export create_Homed_Component_Handler (void) { return new CIAO::Homed_Component_Handler_i (); diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp index a34a2f8b687..9266d42c54b 100644 --- a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp +++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp @@ -163,7 +163,7 @@ namespace CIAO typename COMP_SVNT::_exec_type::_ptr_type exe) { CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component"); - + CORBA::Object_var hobj = this->container_->get_objref (this); diff --git a/CIAO/ciao/Servants/Port_Activator_T.cpp b/CIAO/ciao/Servants/Port_Activator_T.cpp index eb6764b9c43..d52b337b72a 100644 --- a/CIAO/ciao/Servants/Port_Activator_T.cpp +++ b/CIAO/ciao/Servants/Port_Activator_T.cpp @@ -72,7 +72,7 @@ namespace CIAO SERVANT (this->executor_, this->context_), CORBA::NO_MEMORY ()); - + return s; } diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl index d2f5d2559fc..cfd7d2518f1 100644 --- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl +++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl @@ -39,7 +39,7 @@ module CCM_AMI provides AMI4CCM_T ami4ccm_provides; uses T ami4ccm_uses; }; - + connector AMI4CCM_Connector : AMI4CCM_Base { port AMI4CCM_Port_Type ami4ccm_port; diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp index ee15cd0eccd..abefabc5468 100644 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp @@ -238,7 +238,7 @@ namespace CIAO_Hello_Sender_Impl ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") ACE_TEXT("(HELLO) answer <%u>\n"), answer)); - try + try { CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); ACE_DEBUG ((LM_DEBUG, @@ -251,8 +251,8 @@ namespace CIAO_Hello_Sender_Impl ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :") ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); } - - try + + try { my_foo_ami_->rw_attrib (15); ACE_DEBUG ((LM_DEBUG, @@ -266,7 +266,7 @@ namespace CIAO_Hello_Sender_Impl ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ())); } - try + try { CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); ACE_DEBUG ((LM_DEBUG, diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp index 077b13fcc12..ea1dab43577 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender_exec.cpp @@ -1,13 +1,13 @@ // -*- C++ -*- // $Id$ -// test asynchronous +// test asynchronous #include "AsynchT_Sender_exec.h" #include "ace/OS_NS_unistd.h" namespace CIAO_AsynchT_Sender_Impl { - // Keeps the messages on the go. + // Keeps the messages on the go. Atomic_UShort nr_of_sent = 0; // Keeps the messages received back. Atomic_UShort nr_of_rec = 0; @@ -141,10 +141,10 @@ namespace CIAO_AsynchT_Sender_Impl if (CORBA::is_nil (my_foo_ami_)) { ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :" - "\tfoo_ami is NIL !\n")); + "\tfoo_ami is NIL !\n")); return 1; } - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test ++nr_of_sent; my_foo_ami_->sendc_foo ( cb.in(),"Hi ", 1); ACE_DEBUG ((LM_DEBUG, "OK: SEND ASYNCHRONOUS CALL foo.\n")); @@ -288,7 +288,7 @@ namespace CIAO_AsynchT_Sender_Impl { if ((asynch == false) || (nr_of_rec.value() != 5)) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR: Test not asynchronous or not received back" " all requests ( %u/5)!\n", nr_of_rec.value() )); diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl index 5a8b3b2d4f9..b8d0ad74d4c 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.idl @@ -23,7 +23,7 @@ module DelReplyH raises (InternalError); // void hello (out long answer) // raises (InternalError); - + // attribute short rw_attrib // getraises (InternalError) // setraises (InternalError); diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp index d451faee09b..367a32d2f92 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender_exec.cpp @@ -62,24 +62,24 @@ namespace CIAO_DelReplyH_Sender_Impl if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else { //Invoke Asynchronous calls //test with replyhandler. - ::DelReplyH::CCM_AMI4CCM_MyFooReplyHandler_var cb = + ::DelReplyH::CCM_AMI4CCM_MyFooReplyHandler_var cb = new MyFoo_callback_exec_i (); my_foo_ami_->sendc_foo(cb.in(), "Do something asynchronous"); - + } - //Invoke Asynchronous calls to test exception handling + //Invoke Asynchronous calls to test exception handling ::DelReplyH::CCM_AMI4CCM_MyFooReplyHandler_var cb2 = new MyFoo_callback_exec_i (); my_foo_ami_->sendc_foo (cb2.in (), ""); - + return 0; } @@ -99,7 +99,7 @@ namespace CIAO_DelReplyH_Sender_Impl context_->get_connection_run_my_foo (); //run some synch calls - try + try { CORBA::String_var answer; my_foo_ami_->foo("synchronous call", answer.out ()); @@ -173,7 +173,7 @@ namespace CIAO_DelReplyH_Sender_Impl } if ((nr_callbacks.value() == 0) && (nr_exceptions.value() == 1)) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "OK: All constructed ReplyHandlers were deleted.\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl index f02d92c3493..ba6ade291f0 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.idl @@ -24,7 +24,7 @@ module ExceptionT raises (InternalError); void hello (out long answer) raises (InternalError); - + attribute short rw_attrib getraises (InternalError) setraises (InternalError); diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp index c7067fe0fb3..34bc57f9aa6 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.cpp @@ -63,7 +63,7 @@ namespace CIAO_ExceptionT_Receiver_Impl { if (new_value == 0) { - //throw internal excep + //throw internal excep ExceptionT::InternalError ex (42, "Rec.Exc.set_rw_attrib", "thrown by receiver"); throw ex; diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp index 713a1ee2c74..14498f9324d 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender_exec.cpp @@ -8,7 +8,7 @@ namespace CIAO_ExceptionT_Sender_Impl { CORBA::Short nr_of_received = 0; CORBA::Short nr_of_syn_received = 0; - + void HandleException ( long id, const char* error_string, @@ -167,7 +167,7 @@ namespace CIAO_ExceptionT_Sender_Impl ACE_OS::sleep (3); if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else @@ -201,11 +201,11 @@ namespace CIAO_ExceptionT_Sender_Impl { my_foo_ami_->foo ("Do something synchronous", out_str.out ()); - } + } catch (const ExceptionT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } try { @@ -231,7 +231,7 @@ namespace CIAO_ExceptionT_Sender_Impl "hello (syn)"); ++nr_of_syn_received; } - try + try { my_foo_ami_->rw_attrib (); } @@ -242,7 +242,7 @@ namespace CIAO_ExceptionT_Sender_Impl "get_rw_attrib (syn)"); ++nr_of_syn_received; } - try + try { my_foo_ami_->rw_attrib (0); } @@ -253,7 +253,7 @@ namespace CIAO_ExceptionT_Sender_Impl "set_rw_attrib (syn)"); ++nr_of_syn_received; } - try + try { my_foo_ami_->ro_attrib (); } @@ -332,20 +332,20 @@ namespace CIAO_ExceptionT_Sender_Impl ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" " exceptions for asynchronous calls" "Expected: 5, Received: %u.\n", - nr_of_asyn)); + nr_of_asyn)); } if (nr_of_syn_received != 5) { ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" " exceptions for synchronous calls" "Expected: 5, Received: %u.\n", - nr_of_syn_received)); + nr_of_syn_received)); } if ((nr_of_asyn == 5) && (nr_of_syn_received == 5)) { ACE_DEBUG ((LM_DEBUG, "OK: Receieved the expected number of" " exceptions for asynchronous and " - "synchronous calls\n")); + "synchronous calls\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp index 280881a7e4d..19c066148ef 100644 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.cpp @@ -3,7 +3,7 @@ #include "GetComp_Receiver_exec.h" #include "ace/OS_NS_unistd.h" - + namespace CIAO_GetComp_Receiver_Impl { MyFoo_exec_i::MyFoo_exec_i (void) @@ -22,7 +22,7 @@ namespace CIAO_GetComp_Receiver_Impl return 1; } - + Receiver_exec_i::Receiver_exec_i (void) { } diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp index 23188ce7ed1..fdaaa4f77b3 100644 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp @@ -65,7 +65,7 @@ namespace CIAO_GetComp_Sender_Impl ACE_TEXT (" :\tmy_foo_ami is NIL !\n"))); return 1; } - + CORBA::Object_var cmp; try { @@ -97,7 +97,7 @@ namespace CIAO_GetComp_Sender_Impl { ::GetComp::AMI4CCM_MyFoo_Connector::CCM_AMI4CCM_Connector_var conn = ::GetComp::AMI4CCM_MyFoo_Connector::CCM_AMI4CCM_Connector::_narrow (cmp.in ()); - + if (::CORBA::is_nil (conn.in ())) { GetComp::InternalError ex (1, "Narrowed connector is nil.\n"); @@ -159,7 +159,7 @@ namespace CIAO_GetComp_Sender_Impl { if (GetComponent != true) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR:") ACE_TEXT (" Sender not possible to get component\n"))); } diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp index d504f66bb5c..b18feb542e7 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.cpp @@ -3,7 +3,7 @@ #include "InterInArgsT_Receiver_exec.h" #include "ace/OS_NS_unistd.h" - + namespace CIAO_InterInArgsT_Receiver_Impl { CORBA::UShort nr_of_received = 0; @@ -35,7 +35,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl } void - MyFoo_exec_i::var_ins (const char * /*in_str*/, + MyFoo_exec_i::var_ins (const char * /*in_str*/, ::CORBA::String_out answer, ::CORBA::Double cmd) { @@ -50,14 +50,14 @@ namespace CIAO_InterInArgsT_Receiver_Impl { ++nr_of_received; } - answer = CORBA::string_alloc(20); + answer = CORBA::string_alloc(20); ACE_OS::sprintf(answer,"double was %2.2f",cmd); } void - MyFoo_exec_i::var_div_ins (const ::InterInArgsT::TestTopic &test_topic, - const ::InterInArgsT::TopicString &topic_str, - const ::InterInArgsT::TestArray topic_arr, + MyFoo_exec_i::var_div_ins (const ::InterInArgsT::TestTopic &test_topic, + const ::InterInArgsT::TopicString &topic_str, + const ::InterInArgsT::TestArray topic_arr, ::CORBA::String_out answer) { CORBA::Boolean error = false; @@ -98,8 +98,8 @@ namespace CIAO_InterInArgsT_Receiver_Impl } void - MyFoo_exec_i::var_div2_ins (const ::InterInArgsT::X_Union &topic_union, - const ::InterInArgsT::test_seq &seq, + MyFoo_exec_i::var_div2_ins (const ::InterInArgsT::X_Union &topic_union, + const ::InterInArgsT::test_seq &seq, ::CORBA::String_out answer) { CORBA::Boolean error = false; @@ -109,7 +109,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl "received the wrong union, " "expected x = 11," " received x = %u\n", - topic_union.x_long())); + topic_union.x_long())); error = true; } if ((ACE_OS::strcmp (seq[0].x_teststr, "fff") != 0)|| @@ -130,7 +130,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl } void - MyFoo_exec_i::enum_in(::CORBA::String_out answer, + MyFoo_exec_i::enum_in(::CORBA::String_out answer, InterInArgsT::test_enum in_test) { if ( in_test != InterInArgsT::ONE) @@ -194,14 +194,14 @@ namespace CIAO_InterInArgsT_Receiver_Impl if (nr_of_received == 6) { ACE_DEBUG ((LM_DEBUG, "OK: Receiver received all expected data" - " from syn- and asynchronous calls\n")); + " from syn- and asynchronous calls\n")); } else { ACE_ERROR ((LM_ERROR, "ERROR: Receiver didn't receive all" " expected data (%u of 6)" " from syn- and asynchronous calls\n", - nr_of_received)); + nr_of_received)); } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp index e8401d75cc1..6f78de19651 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp @@ -107,7 +107,7 @@ namespace CIAO_InterInArgsT_Sender_Impl { excep_holder->raise_exception (); } - + void MyFoo_callback_exec_i::var_div2_ins ( const char * /*answer*/) @@ -122,7 +122,7 @@ namespace CIAO_InterInArgsT_Sender_Impl excep_holder->raise_exception (); } - void + void MyFoo_callback_exec_i::enum_in(const char * /*answer*/) { ++nr_of_received; @@ -134,7 +134,7 @@ namespace CIAO_InterInArgsT_Sender_Impl { excep_holder->raise_exception (); } - + //============================================================ // Worker thread for asynchronous invocations for MyFoo //============================================================ @@ -152,12 +152,12 @@ namespace CIAO_InterInArgsT_Sender_Impl if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else { - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_foo_ami_->sendc_foo ( new MyFoo_callback_exec_i (), "Hi", cmd_asynch_ok); //this shoukd invoke a exception @@ -165,7 +165,7 @@ namespace CIAO_InterInArgsT_Sender_Impl "", cmd_asynch_nok); my_foo_ami_->sendc_var_ins( new MyFoo_callback_exec_i (), "Here a double for you.", 1.6); - + InterInArgsT::TestTopic test_topic; test_topic.key = "aaa"; test_topic.x = 10; @@ -179,7 +179,7 @@ namespace CIAO_InterInArgsT_Sender_Impl for (CORBA::UShort y = 0; y < 5; y ++) { topic_arr[i].x_array[y] = i * 100 + y ; - } + } } my_foo_ami_->sendc_var_div_ins (new MyFoo_callback_exec_i (), test_topic,topic_str,topic_arr); @@ -191,13 +191,13 @@ namespace CIAO_InterInArgsT_Sender_Impl ttt.x_teststr = "fff" ; InterInArgsT::test_seq seq; seq.length(2); - seq[0] = ttt; + seq[0] = ttt; my_foo_ami_->sendc_var_div2_ins (new MyFoo_callback_exec_i (), topic_union, seq); InterInArgsT::test_enum in_test; in_test = ::InterInArgsT::ONE; - my_foo_ami_->sendc_enum_in(new MyFoo_callback_exec_i (), + my_foo_ami_->sendc_enum_in(new MyFoo_callback_exec_i (), in_test); } return 0; @@ -229,11 +229,11 @@ namespace CIAO_InterInArgsT_Sender_Impl { ++nr_of_received; } - } + } catch (const InterInArgsT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } try { @@ -304,7 +304,7 @@ namespace CIAO_InterInArgsT_Sender_Impl ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" " exceptions" "Expected: 2, Received: %u.\n", - nr_of_excep_received)); + nr_of_excep_received)); } if (nr_of_received != 6) { @@ -312,13 +312,13 @@ namespace CIAO_InterInArgsT_Sender_Impl " of callbacks and returns for syn- and " "asynchronous calls. Expected: 6," " Received: %u.\n", - nr_of_excep_received)); + nr_of_excep_received)); } if ((nr_of_received == 6) && (nr_of_excep_received == 2)) { ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of" " callbacks and exceptions for syn- and " - "asynchronous calls\n")); + "asynchronous calls\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp index 475e3cb7b3f..b6af2b7b823 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.cpp @@ -3,7 +3,7 @@ #include "InterInOutT_Receiver_exec.h" #include "ace/OS_NS_unistd.h" - + namespace CIAO_InterInOutT_Receiver_Impl { CORBA::UShort nr_of_received = 0; @@ -43,11 +43,11 @@ namespace CIAO_InterInOutT_Receiver_Impl cmd = cmd + update_val; } return cmd; - + } void - MyFoo_exec_i::var_ins (const char * /*in_str*/, + MyFoo_exec_i::var_ins (const char * /*in_str*/, ::CORBA::String_out answer, ::CORBA::Double_out cmd) { @@ -62,15 +62,15 @@ namespace CIAO_InterInOutT_Receiver_Impl { ++nr_of_received; } - answer = CORBA::string_alloc(20); + answer = CORBA::string_alloc(20); ACE_OS::sprintf(answer,"double was %2.2f",cmd); cmd = 3.2; } void - MyFoo_exec_i::var_div_ins (::InterInOutT::TestTopic &test_topic, - ::InterInOutT::TopicString &topic_str, - ::InterInOutT::TestArray topic_arr, + MyFoo_exec_i::var_div_ins (::InterInOutT::TestTopic &test_topic, + ::InterInOutT::TopicString &topic_str, + ::InterInOutT::TestArray topic_arr, char * &answer) { CORBA::Boolean error = false; @@ -94,7 +94,7 @@ namespace CIAO_InterInOutT_Receiver_Impl topic_str.key.in() ,topic_str.x_str.in())); error = true; } - + if ((ACE_OS::strcmp (topic_arr[0].key, "ddd") != 0) || (topic_arr[1].x_array[2] != 102)) { @@ -105,7 +105,7 @@ namespace CIAO_InterInOutT_Receiver_Impl topic_arr[0].key.in(),topic_arr[1].x_array[2] )); error = true; } - + answer = CORBA::string_dup ("This is my answer from var_div_ins"); if(error == false) { @@ -120,8 +120,8 @@ namespace CIAO_InterInOutT_Receiver_Impl } void - MyFoo_exec_i::var_div2_ins (::InterInOutT::X_Union &topic_union, - ::InterInOutT::test_seq &seq, + MyFoo_exec_i::var_div2_ins (::InterInOutT::X_Union &topic_union, + ::InterInOutT::test_seq &seq, CORBA::String_out answer) { CORBA::Boolean error = false; @@ -131,7 +131,7 @@ namespace CIAO_InterInOutT_Receiver_Impl "received the wrong union, " "expected x = 11," " received x = %u\n", - topic_union.x_long())); + topic_union.x_long())); error = true; } if ((ACE_OS::strcmp (seq[0].x_teststr, "fff") != 0)|| @@ -155,7 +155,7 @@ namespace CIAO_InterInOutT_Receiver_Impl } void - MyFoo_exec_i::enum_in(CORBA::String_out answer, + MyFoo_exec_i::enum_in(CORBA::String_out answer, InterInOutT::test_enum &in_test) { if (in_test != InterInOutT::ONE) @@ -220,14 +220,14 @@ namespace CIAO_InterInOutT_Receiver_Impl if (nr_of_received == 6) { ACE_DEBUG ((LM_DEBUG, "OK: Receiver received all expected data" - " from syn- and asynchronous calls\n")); + " from syn- and asynchronous calls\n")); } else { ACE_ERROR ((LM_ERROR, "ERROR: Receiver didn't receive all" " expected data (%u of 6)" " from syn- and asynchronous calls\n", - nr_of_received)); + nr_of_received)); } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp index 2ddbb41927f..c8aab7d0203 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender_exec.cpp @@ -102,7 +102,7 @@ namespace CIAO_InterInOutT_Sender_Impl MyFoo_callback_exec_i::var_div_ins ( const InterInOutT::TestTopic &test_topic, const InterInOutT::TopicString &topic_str, - const InterInOutT::TestArray topic_arr, + const InterInOutT::TestArray topic_arr, const char * /*answer*/) { CORBA::Boolean error = false; @@ -126,7 +126,7 @@ namespace CIAO_InterInOutT_Sender_Impl topic_str.key.in() ,topic_str.x_str.in())); error = true; } - + if ((ACE_OS::strcmp (topic_arr[0].key, "444") != 0) || (topic_arr[1].x_array[2] != 444)) { @@ -150,7 +150,7 @@ namespace CIAO_InterInOutT_Sender_Impl { excep_holder->raise_exception (); } - + void MyFoo_callback_exec_i::var_div2_ins (const InterInOutT::X_Union &x_uni, const InterInOutT::test_seq &seq, @@ -163,7 +163,7 @@ namespace CIAO_InterInOutT_Sender_Impl "received the wrong union, " "expected x = 555," " received x = %u\n", - x_uni.x_long())); + x_uni.x_long())); error = true; } if ((ACE_OS::strcmp (seq[0].x_teststr, "666") != 0)|| @@ -189,7 +189,7 @@ namespace CIAO_InterInOutT_Sender_Impl excep_holder->raise_exception (); } - void + void MyFoo_callback_exec_i::enum_in( const char * /*answer*/, InterInOutT::test_enum test_enum) { @@ -212,7 +212,7 @@ namespace CIAO_InterInOutT_Sender_Impl { excep_holder->raise_exception (); } - + //============================================================ // Worker thread for asynchronous invocations for MyFoo //============================================================ @@ -224,19 +224,19 @@ namespace CIAO_InterInOutT_Sender_Impl int asynch_foo_generator::svc () { - ACE_OS::sleep (3); + ACE_OS::sleep (3); ::InterInOutT::AMI4CCM_MyFoo_var my_foo_ami_ = context_->get_connection_sendc_run_my_foo(); if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else { CORBA::Long l_cmd = 3; CORBA::String_var answer = CORBA::string_dup("Hi from sender"); - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_foo_ami_->sendc_foo ( new MyFoo_callback_exec_i (), "Do something synchronous", l_cmd, answer.inout()); @@ -246,7 +246,7 @@ namespace CIAO_InterInOutT_Sender_Impl "", l_cmd, answer.inout()); my_foo_ami_->sendc_var_ins( new MyFoo_callback_exec_i (), "Here a double for you.", 1.6); - + InterInOutT::TestTopic test_topic; test_topic.key = "aaa"; test_topic.x = 10; @@ -260,7 +260,7 @@ namespace CIAO_InterInOutT_Sender_Impl for (CORBA::UShort y = 0; y < 5; y ++) { topic_arr[i].x_array[y] = i * 100 + y ; - } + } } my_foo_ami_->sendc_var_div_ins (new MyFoo_callback_exec_i (), test_topic,topic_str,topic_arr, answer); @@ -272,13 +272,13 @@ namespace CIAO_InterInOutT_Sender_Impl ttt.x_teststr = "fff" ; InterInOutT::test_seq seq; seq.length(2); - seq[0] = ttt; + seq[0] = ttt; my_foo_ami_->sendc_var_div2_ins (new MyFoo_callback_exec_i (), topic_union, seq); InterInOutT::test_enum in_test; in_test = ::InterInOutT::ONE; - my_foo_ami_->sendc_enum_in(new MyFoo_callback_exec_i (), + my_foo_ami_->sendc_enum_in(new MyFoo_callback_exec_i (), in_test); } return 0; @@ -312,11 +312,11 @@ namespace CIAO_InterInOutT_Sender_Impl { ++nr_of_received; } - } + } catch (const InterInOutT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::foo: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } try { @@ -390,7 +390,7 @@ namespace CIAO_InterInOutT_Sender_Impl ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" " exceptions" "Expected: 2, Received: %u.\n", - nr_of_excep_received)); + nr_of_excep_received)); } if (nr_of_received != 6) { @@ -398,13 +398,13 @@ namespace CIAO_InterInOutT_Sender_Impl " of callbacks and returns for syn- and " "asynchronous calls. Expected: 6," " Received: %u.\n", - nr_of_excep_received)); + nr_of_excep_received)); } if ((nr_of_received == 6) && (nr_of_excep_received == 2)) { ACE_DEBUG ((LM_DEBUG, "OK: Sender received the expected number of" " callbacks and exceptions for syn- and " - "asynchronous calls\n")); + "asynchronous calls\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp index 40922ea17ce..9955a481dc8 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.cpp @@ -21,12 +21,12 @@ namespace CIAO_InterMulti_Receiver_Impl { ACE_DEBUG ((LM_DEBUG, "Receiver: one_foo, in_str = %C" " cmd = <%u>\n", - in_str, cmd)); + in_str, cmd)); if (cmd != 1) { ACE_ERROR ((LM_ERROR, "ERROR: Receiver ONE::foo," " origin not 1, but <%u>\n", - cmd)); + cmd)); } else { @@ -50,12 +50,12 @@ namespace CIAO_InterMulti_Receiver_Impl { ACE_DEBUG ((LM_DEBUG, "Receiver: two_bar," " cmd = <%u>\n", - cmd)); + cmd)); if (cmd != 2) { ACE_ERROR ((LM_ERROR, "ERROR Receiver: TWO::bar," " origin not 2, but <%u>\n", - cmd)); + cmd)); } else { @@ -78,7 +78,7 @@ namespace CIAO_InterMulti_Receiver_Impl { ACE_DEBUG ((LM_DEBUG, "Receiver: three_plus," " cmd = <%u>\n", - cmd)); + cmd)); ++nr_of_received; answer = CORBA::string_dup ("answer plus three"); } @@ -89,12 +89,12 @@ namespace CIAO_InterMulti_Receiver_Impl { ACE_DEBUG ((LM_DEBUG, "Receiver: three_foo, in_str = %C" " cmd = <%u>\n", - in_str, cmd)); + in_str, cmd)); if (cmd != 3) { ACE_ERROR ((LM_ERROR, "ERROR: Receiver THREE::foo," " origin not 3, but <%u>\n", - cmd)); + cmd)); } else { @@ -115,7 +115,7 @@ namespace CIAO_InterMulti_Receiver_Impl { ACE_ERROR ((LM_ERROR, "ERROR: Receiver Three::bar," " origin not 3, but <%u>\n", - cmd)); + cmd)); } else { @@ -185,14 +185,14 @@ namespace CIAO_InterMulti_Receiver_Impl ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" "correct calls" "Expected: 7, Received: %u.\n", - nr_of_received.value())); + nr_of_received.value())); } else { ACE_DEBUG ((LM_DEBUG, "OK: Receiver received the expected " "number of correct calls. " "Expected: 7, Received: %u.\n", - nr_of_received.value())); + nr_of_received.value())); } } diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp index d7b712f64a1..e8c3463ea55 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender_exec.cpp @@ -88,7 +88,7 @@ namespace CIAO_InterMulti_Sender_Impl { ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::plus," " answer = <%C>\n", - answer)); + answer)); ++nr_of_received; } @@ -106,7 +106,7 @@ namespace CIAO_InterMulti_Sender_Impl { ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::foo," " answer = <%C>\n", - answer)); + answer)); ++nr_of_received; } @@ -122,7 +122,7 @@ namespace CIAO_InterMulti_Sender_Impl { ACE_DEBUG ((LM_DEBUG, "OK: Get asynchronous callback from THREE::bar," " answer = <%C>\n", - answer)); + answer)); ++nr_of_received; } @@ -146,7 +146,7 @@ namespace CIAO_InterMulti_Sender_Impl ::InterMulti::AMI4CCM_One_var my_one_ami_ = context_->get_connection_sendc_run_my_one(); - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_one_ami_->sendc_foo ( new One_callback_exec_i (), "Hi from asynch call ONE::foo", 1); return 0; @@ -168,13 +168,13 @@ namespace CIAO_InterMulti_Sender_Impl if (CORBA::is_nil (my_two_ami_.in ())) { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (ASYNCH) :my_two_ami_ is NIL !\n")); + ACE_ERROR ((LM_ERROR, + "ERROR Sender (ASYNCH) :my_two_ami_ is NIL !\n")); return 1; } else { - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_two_ami_->sendc_bar ( new Two_callback_exec_i (), 2); } return 0; @@ -196,15 +196,15 @@ namespace CIAO_InterMulti_Sender_Impl if (CORBA::is_nil (my_three_ami_)) { - ACE_ERROR ((LM_ERROR, - "ERROR Sender (ASYNCH) :my_three_ami_ is NIL !\n")); + ACE_ERROR ((LM_ERROR, + "ERROR Sender (ASYNCH) :my_three_ami_ is NIL !\n")); return 1; } else { - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_three_ami_->sendc_plus( new Three_callback_exec_i (), 3); - // derived from CLASS ONE + // derived from CLASS ONE my_three_ami_->sendc_foo ( new Three_callback_exec_i (),"hoi", 3); // derived fron CLASS TWO my_three_ami_->sendc_bar ( new Three_callback_exec_i (), 3); @@ -232,7 +232,7 @@ namespace CIAO_InterMulti_Sender_Impl answer.out ()); if (result != 1) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR Sender (SYNCH) : CLASS One foo !\n")); } return 0; @@ -259,7 +259,7 @@ namespace CIAO_InterMulti_Sender_Impl answer.out ()); if (result != 3) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR Sender (SYNCH) : CLASS Three foo !\n")); } return 0; @@ -337,8 +337,8 @@ namespace CIAO_InterMulti_Sender_Impl } else { - ACE_DEBUG ((LM_DEBUG, - "OK: All messages received back by Sender\n")); + ACE_DEBUG ((LM_DEBUG, + "OK: All messages received back by Sender\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp index 0cecd70c152..0e0c7b3cd90 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/Plan.cdp @@ -258,7 +258,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver"> <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver</name> <node>Receiver</node> @@ -346,9 +346,9 @@ </value> </configProperty> </instance> - - - + + + <connection> <name>run_asynch_one_connection</name> @@ -407,7 +407,7 @@ <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree" /> </internalEndpoint> </connection> - + <connection> <name>do_one_connection</name> <internalEndpoint> diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl index f059196fc15..a116fd1b60d 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.idl @@ -26,7 +26,7 @@ module InterOutArgsT // Array struct TopicArray { - string key; + string key; short_array x_array; }; @@ -68,7 +68,7 @@ module InterOutArgsT out TopicArray topic_arr) raises (InternalError); void var_div2_outs (out X_Union x_uni, - out test_seq seq) + out test_seq seq) raises (InternalError); void enum_out (out test_enum out_test) raises (InternalError); diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp index 2636f347c2a..c5862b9129f 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.cpp @@ -15,7 +15,7 @@ namespace CIAO_InterOutArgsT_Receiver_Impl } void - MyFoo_exec_i::var_outs (const char * /*in_str*/, + MyFoo_exec_i::var_outs (const char * /*in_str*/, ::CORBA::String_out answer, ::CORBA::Double_out d_cmd, ::CORBA::Long_out l_cmd) @@ -25,15 +25,15 @@ namespace CIAO_InterOutArgsT_Receiver_Impl l_cmd = 100; } - void MyFoo_exec_i::var_div_outs (::InterOutArgsT::TestTopic_out test_topic, - ::InterOutArgsT::TopicString_out topic_str, + void MyFoo_exec_i::var_div_outs (::InterOutArgsT::TestTopic_out test_topic, + ::InterOutArgsT::TopicString_out topic_str, ::InterOutArgsT::TopicArray_out topic_arr) { InterOutArgsT::TestTopic *new_topic = new InterOutArgsT::TestTopic(); test_topic = new_topic; test_topic->key = CORBA::string_dup("aaa"); test_topic->x = 10; - + topic_str = new InterOutArgsT::TopicString(); topic_str->key = CORBA::string_dup("bbb"); topic_str->x_str = CORBA::string_dup("ccc"); @@ -46,18 +46,18 @@ namespace CIAO_InterOutArgsT_Receiver_Impl } } - void MyFoo_exec_i::var_div2_outs (::InterOutArgsT::X_Union_out x_uni, + void MyFoo_exec_i::var_div2_outs (::InterOutArgsT::X_Union_out x_uni, ::InterOutArgsT::test_seq_out seq) { x_uni = new InterOutArgsT::X_Union(); x_uni->x_long(11); - + InterOutArgsT::test ttt; ttt.x_test = 12; ttt.x_teststr = CORBA::string_dup("fff") ; seq = new InterOutArgsT::test_seq(); seq->length(2); - (*seq)[0]= ttt; + (*seq)[0]= ttt; } void MyFoo_exec_i::enum_out (::InterOutArgsT::test_enum_out out_test) diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp index 2f75de3f47a..48bb8d71500 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp @@ -8,7 +8,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl { CORBA::Short nr_of_received = 0; - + //============================================================ // Facet Executor Implementation Class: MyFoo_callback_exec_i //============================================================ @@ -103,7 +103,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl { excep_holder->raise_exception (); } - + void MyFoo_callback_exec_i::var_div2_outs ( const InterOutArgsT::X_Union &x_uni, @@ -165,7 +165,7 @@ namespace CIAO_InterOutArgsT_Sender_Impl { excep_holder->raise_exception (); } - + //============================================================ // Worker thread for asynchronous invocations for MyFoo //============================================================ @@ -183,12 +183,12 @@ namespace CIAO_InterOutArgsT_Sender_Impl if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else { - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_foo_ami_->sendc_var_outs ( new MyFoo_callback_exec_i (), "Send me a double and a long."); my_foo_ami_->sendc_var_div_outs (new MyFoo_callback_exec_i ()); @@ -230,11 +230,11 @@ namespace CIAO_InterOutArgsT_Sender_Impl { ++nr_of_received; } - } + } catch (const InterOutArgsT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::var_outs: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } try { @@ -247,13 +247,13 @@ namespace CIAO_InterOutArgsT_Sender_Impl else { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::var_div_outs: " - "Unexpected data returned.\n")); + "Unexpected data returned.\n")); } } catch (const InterOutArgsT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::var_div_outs: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } return 0; } @@ -313,12 +313,12 @@ namespace CIAO_InterOutArgsT_Sender_Impl if (nr_of_received == 6) { ACE_DEBUG ((LM_DEBUG, "OK: Sender received all expected data" - " for syn- and asynchronous calls\n")); + " for syn- and asynchronous calls\n")); } else { ACE_ERROR ((LM_ERROR, "ERROR: Sender didn't receive all expected data" - " for syn- and asynchronous calls\n")); + " for syn- and asynchronous calls\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl index 058690e907e..449b42cc722 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.idl @@ -20,7 +20,7 @@ module InterReturnT // Array struct TestArr { - string key; + string key; short_array x_array; }; diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp index 8093386f751..f032525c199 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.cpp @@ -66,7 +66,7 @@ namespace CIAO_InterReturnT_Receiver_Impl for (CORBA::UShort y = 0; y < 5; y ++) { test_array[i].x_array[y] = i * 100 + y ; - } + } } return InterReturnT::TestArray_dup(test_array); } diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp index 63b3ab6956e..275b0f984c6 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp @@ -48,7 +48,7 @@ namespace CIAO_InterReturnT_Sender_Impl } void - MyFoo_callback_exec_i::ret_long (::CORBA::Long ami_return_val, + MyFoo_callback_exec_i::ret_long (::CORBA::Long ami_return_val, const char * /*answer*/, CORBA::Long l_cmd) { if ((l_cmd != 2) || (ami_return_val != 200)) @@ -190,7 +190,7 @@ namespace CIAO_InterReturnT_Sender_Impl MyFoo_callback_exec_i::ret_union ( const InterReturnT::X_Union &ami_return_val, const char * /*answer*/, CORBA::Long l_cmd) - { + { if ((l_cmd != 7) || (ami_return_val.x_long() != 11)) { ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_union: " @@ -253,12 +253,12 @@ namespace CIAO_InterReturnT_Sender_Impl if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else { - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test my_foo_ami_->sendc_ret_void (new MyFoo_callback_exec_i (), "Send me a void." ); my_foo_ami_->sendc_ret_long (new MyFoo_callback_exec_i (),"Send me a long."); my_foo_ami_->sendc_ret_double (new MyFoo_callback_exec_i (),"Send me a double."); @@ -294,21 +294,21 @@ namespace CIAO_InterReturnT_Sender_Impl CORBA::String_var out_str; try { - CORBA::Double ret = + CORBA::Double ret = my_foo_ami_->ret_double ("Send me synch double",out_str, l_cmd); if ( (ret == 3.14 ) && (l_cmd == 3)) { ++nr_of_received; } - } + } catch (const InterReturnT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_double: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } try { - InterReturnT::TestArray_slice *arr = + InterReturnT::TestArray_slice *arr = my_foo_ami_->ret_array ("Send me synch array",out_str.out (), l_cmd); ++arr; if ((l_cmd != 5) || (arr->x_array[2] != 102)) @@ -317,17 +317,17 @@ namespace CIAO_InterReturnT_Sender_Impl "received the wrong long or array, expected 5 " "and 102, received %u and %u\n", l_cmd, arr->x_array[2])); - } + } else { ++nr_of_received; } } - + catch (const InterReturnT::InternalError&) { ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_array: " - "Unexpected exception.\n")); + "Unexpected exception.\n")); } return 0; } @@ -388,13 +388,13 @@ namespace CIAO_InterReturnT_Sender_Impl if (nr_of_received == 10) { ACE_DEBUG ((LM_DEBUG, "OK: Sender received all expected return data" - " for syn- and asynchronous calls\n")); + " for syn- and asynchronous calls\n")); } else { ACE_ERROR ((LM_ERROR, "ERROR: Sender didn't receive all expected" " return data for syn- and asynchronous" - " calls\n")); + " calls\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl index 002a6c369b1..eadfc36f4e6 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.idl @@ -23,7 +23,7 @@ module NoReplyH raises (InternalError); void hello (out long answer) raises (InternalError); - + attribute short rw_attrib getraises (InternalError) setraises (InternalError); diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp index e9aa1ce974a..db4c59b06fb 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.cpp @@ -120,14 +120,14 @@ namespace CIAO_NoReplyH_Receiver_Impl ACE_ERROR ((LM_ERROR, "ERROR: not received the expected number of" "calls" "Expected: 10, Received: %u.\n", - this->calls_.value())); + this->calls_.value())); } else { ACE_DEBUG ((LM_DEBUG, "OK: Receiver received the expected " "number of calls. " "Expected: 10, Received: %u.\n", - this->calls_.value())); + this->calls_.value())); } } diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp index a1b6ecb3c5f..e234db9bcdc 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender_exec.cpp @@ -127,7 +127,7 @@ namespace CIAO_NoReplyH_Sender_Impl ACE_OS::sleep (3); if (CORBA::is_nil (my_foo_ami_)) { - ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); + ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :\tfoo_ami is NIL !\n")); return 1; } else @@ -136,7 +136,7 @@ namespace CIAO_NoReplyH_Sender_Impl //test with replyhandler. my_foo_ami_->sendc_foo ( new MyFoo_callback_exec_i (), "Do something asynchronous"); - + //test without replyhandlers. my_foo_ami_->sendc_foo ( NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), "Do something asynchronous with no replyhandler"); @@ -146,12 +146,12 @@ namespace CIAO_NoReplyH_Sender_Impl 15); my_foo_ami_->sendc_get_ro_attrib (NoReplyH::AMI4CCM_MyFooReplyHandler::_nil ()); } - //Invoke Asynchronous calls to test exception handling + //Invoke Asynchronous calls to test exception handling //without replyhandlers. my_foo_ami_->sendc_foo ( NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), ""); my_foo_ami_->sendc_set_rw_attrib (NoReplyH::AMI4CCM_MyFooReplyHandler::_nil (), 0); - + return 0; } @@ -167,7 +167,7 @@ namespace CIAO_NoReplyH_Sender_Impl { ACE_OS::sleep (3); //run some synch calls - try + try { CORBA::Short rw_attrib = my_foo_ami_->rw_attrib (); ACE_DEBUG ((LM_DEBUG, "OK: SYNCH rw_attrib() returns %u.\n", @@ -178,7 +178,7 @@ namespace CIAO_NoReplyH_Sender_Impl ACE_ERROR ((LM_ERROR, "ERROR: SYNCH rw_attrib(): " "Unexpected return.\n")); } - try + try { CORBA::Short ro_attrib = my_foo_ami_->ro_attrib (); ACE_DEBUG ((LM_DEBUG, "OK: SYNCH ro_attrib() returns %u.\n", diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp index 1fa06eded3d..f50d932bdfd 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender_exec.cpp @@ -75,13 +75,13 @@ namespace CIAO_OneProcess_Sender_Impl if (CORBA::is_nil (my_foo_ami_)) { ACE_ERROR ((LM_ERROR, "ERROR Sender (ASYNCH) :" - "\tfoo_ami is NIL !\n")); + "\tfoo_ami is NIL !\n")); return 1; } if (asynch == true) { //expect to have receive an answer before you come here again. - //if asynch == true, error because no answer received in + //if asynch == true, error because no answer received in //MyFoo_callback_exec_i::foo ACE_ERROR ((LM_ERROR, "ERROR: not received synchronus answer " "for asynchronous call\n")); @@ -89,12 +89,12 @@ namespace CIAO_OneProcess_Sender_Impl else { ++nr_of_sent; - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test if (i == 0) - { + { asynch = true; my_foo_ami_->sendc_foo ( cb0.in(),"Hi 1", 1); - } + } else if (i == 1) { asynch = true; @@ -222,14 +222,14 @@ namespace CIAO_OneProcess_Sender_Impl { if ((asynch == true) || (nr_of_sent.value() != 5)) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR: All in one proces worked asynchronous, " - "this was not expected!\n")); + "this was not expected!\n")); } else { - ACE_DEBUG ((LM_DEBUG, - "OK: All in one proces worked synchronous as expected\n")); + ACE_DEBUG ((LM_DEBUG, + "OK: All in one proces worked synchronous as expected\n")); } } diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp index 636e8a35245..0d12bf9a45a 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.cpp @@ -3,7 +3,7 @@ #include "OneReplyH_Receiver_exec.h" #include "ace/OS_NS_unistd.h" - + namespace CIAO_OneReplyH_Receiver_Impl { MyFoo_exec_i::MyFoo_exec_i (void) diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp index dc2498d0055..e7b0f5b5d77 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.cpp @@ -19,7 +19,7 @@ namespace CIAO_UsesSM_Receiver_Impl One_exec_i::foo (const char * in_str, ::CORBA::Long cmd, ::CORBA::String_out answer) { - // sleep to make it possible to test asynchronous behavior. + // sleep to make it possible to test asynchronous behavior. ACE_OS::sleep(2); ++nr_of_one_received_; answer = CORBA::string_dup (in_str); diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp index b4af796b3a8..d880c6bfd17 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp @@ -86,7 +86,7 @@ namespace CIAO_UsesSM_Sender_Impl // multiple ::UsesSM::Sender::sendc_run_my_um_oneConnections_var my_one_ami_ = context_->get_connections_sendc_run_my_um_one(); - // simplex + // simplex ::UsesSM::AMI4CCM_Two_var my_two_ami_ = context_->get_connection_sendc_run_my_two(); @@ -151,7 +151,7 @@ namespace CIAO_UsesSM_Sender_Impl { ::UsesSM::Sender::run_my_um_oneConnections_var my_one_ami_ = context_->get_connections_run_my_um_one (); - + for(CORBA::ULong i = 0; i < my_one_ami_->length(); ++i) { CORBA::String_var test; @@ -179,11 +179,11 @@ namespace CIAO_UsesSM_Sender_Impl answer.out ()); if (result != i) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR Sender (SYNCH) : CLASS One foo !\n")); } else - { + { ++nr_of_received; ACE_DEBUG ((LM_DEBUG, "Sender (SYNCH) : received answer = <%C> !\n", diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp index c5449e2f8de..546377683eb 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/Plan.cdp @@ -105,7 +105,7 @@ </value> </execParameter> </implementation> - + <!-- conn one--> <implementation xmi:id="UsesSM_AMIOneHomeImplementation"> <name>UsesSM_AMIHomeImplementation</name> @@ -207,7 +207,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.ReceiverA"> <name>UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.ReceiverA</name> <node>Receiver</node> @@ -276,7 +276,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.Sender"> <name>UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.Sender</name> <node>Sender</node> @@ -346,7 +346,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.AMITwoS"> <name>UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.AMITwoS</name> <node>Sender</node> @@ -364,7 +364,7 @@ </value> </configProperty> </instance> - + <connection> <name>run_asynch_one_connectionA</name> <deployRequirement> @@ -441,7 +441,7 @@ <instance xmi:idref="UsesSM.ComponentImplementations.UsesSMImplementation.UsesSM.AMITwoS" /> </internalEndpoint> </connection> - + <connection> <name>do_one_connectionA</name> <internalEndpoint> @@ -603,7 +603,7 @@ </value> </execParameter> </artifact> - + <artifact xmi:id="UsesSM_AMITwo_ExecArtifact"> <name>UsesSM.ImplementationArtifacts.AMIArtifacts.AMI_exec</name> <source/> diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp index b468fc62a28..e593a2e9c0d 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master_exec.cpp @@ -7,7 +7,7 @@ namespace CIAO_ThreeComp_Master_Impl { - // Keeps the messages on the go. + // Keeps the messages on the go. Atomic_UShort nr_of_sent = 0; // Keeps the messages received back from the Sender. Atomic_UShort nr_of_rec = 0; @@ -69,7 +69,7 @@ namespace CIAO_ThreeComp_Master_Impl "\tstate_ami is NIL !\n")); return 1; } - //Invoke Asynchronous calls to test + //Invoke Asynchronous calls to test for (int i = 0; i < 3; i ++) { @@ -184,7 +184,7 @@ namespace CIAO_ThreeComp_Master_Impl { if ((asynch == false) || (nr_of_rec.value() != 3)) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR: Test not asynchronous or not received back" " all requests ( %u/3)!\n", nr_of_rec.value() )); diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt b/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt index bdfd091f144..9391e7e8e3a 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/README.txt @@ -3,6 +3,6 @@ This test exists of 3 components. -Master component which sends asynchronous and synchronous calls to a Sender. -Sender which recieves asynchronous and synchronous calls from the Master and replies them. Also the -Sender sends asynchronous and synchronous calls ( uses multiple) to 3 Receivers. So the Sender has +Sender sends asynchronous and synchronous calls ( uses multiple) to 3 Receivers. So the Sender has 'uses' and 'provides' ports. -Receiver which recieves asynchronous and synchronous calls from the Sender and replies them. diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp index c6b3b63a77d..7f41058222c 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.cpp @@ -8,7 +8,7 @@ namespace CIAO_ThreeComp_Sender_Impl { - // Keeps the messages on the go. + // Keeps the messages on the go. Atomic_UShort nr_of_sent = 0; // Keeps the messages received back from Receiver. Atomic_UShort nr_of_rec = 0; @@ -210,7 +210,7 @@ namespace CIAO_ThreeComp_Sender_Impl if ((asynch == false) || (nr_of_rec.value() != 6) || (nr_of_sent.value() != 0)) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR: Test not asynchronous or not received back" " all requests ( %u/6)!\n", nr_of_rec.value() )); diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp index c23185f03ee..5abe0cc2f4a 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/descriptors/Plan.cdp @@ -313,8 +313,8 @@ </value> </configProperty> </instance> - - + + <instance xmi:id="ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.Sender"> <name>ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.Sender</name> @@ -481,7 +481,7 @@ <instance xmi:idref="ThreeComp.ComponentImplementations.ThreeCompImplementation.ThreeComp.AMI1C" /> </internalEndpoint> </connection> - + <connection> <name>run_asynch_state_connection</name> diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp index 64159e36be8..a4b603ae4da 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp @@ -79,7 +79,7 @@ namespace CIAO_UsesMulti_Sender_Impl ++nr_of_sent; my_one_ami_[i].objref->sendc_foo (new One_callback_exec_i (), test.in (), - i); + i); ACE_DEBUG ((LM_DEBUG, "Sender (ASYNCH) : send <%C> !\n", test.in ())); // There is more than 1 message sent, without receiving callbacks, @@ -132,11 +132,11 @@ namespace CIAO_UsesMulti_Sender_Impl answer.out ()); if (result != i) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "ERROR Sender (SYNCH) : CLASS One foo !\n")); } else - { + { ++nr_of_received; ACE_DEBUG ((LM_DEBUG, "Sender (SYNCH) : received answer = <%C> !\n", diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp index 099bd834b40..8e9d17cf7b0 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/Plan.cdp @@ -105,7 +105,7 @@ </value> </execParameter> </implementation> - + <!-- conn one--> <implementation xmi:id="UsesMulti_AMIOneHomeImplementation"> <name>UsesMulti_AMIHomeImplementation</name> @@ -157,7 +157,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA"> <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA</name> <node>Receiver</node> @@ -279,8 +279,8 @@ </value> </configProperty> </instance> - - + + <connection> <name>run_asynch_one_connectionA</name> <deployRequirement> @@ -338,8 +338,8 @@ <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" /> </internalEndpoint> </connection> - - + + <connection> <name>do_one_connectionA</name> <internalEndpoint> @@ -385,8 +385,8 @@ <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" /> </internalEndpoint> </connection> - - + + <connection> <name>synch_one_connectionA</name> @@ -433,9 +433,9 @@ <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" /> </internalEndpoint> </connection> - - - + + + <artifact xmi:id="UsesMulti_AMIOne_SvntArtifact"> <name>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name> <source/> @@ -453,8 +453,8 @@ </value> </execParameter> </artifact> - - + + <artifact xmi:id="UsesMulti_AMIOne_ExecArtifact"> <name>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name> @@ -473,7 +473,7 @@ </value> </execParameter> </artifact> - + <artifact xmi:id="UsesMulti_Receiver_SvntArtifact"> <name>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name> diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp index d05dfdae30c..b8b9fb7f846 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp @@ -132,7 +132,7 @@ namespace CIAO_Hello_Sender_comp_Impl MyFoo_obj_callback_exec_i::get_ro_attrib_excep ( ::CCM_AMI::ExceptionHolder * excep_holder) { - /* Your code here. */ + /* Your code here. */ excep_holder->raise_exception (); } @@ -206,7 +206,7 @@ namespace CIAO_Hello_Sender_comp_Impl out_str.out()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (foo)\n") - ACE_TEXT(" result <%u> answer <%C>\n"), + ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in())); CORBA::Long answer; @@ -233,7 +233,7 @@ namespace CIAO_Hello_Sender_comp_Impl ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") ACE_TEXT("(rw_attrib(15))\n"))); - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Sender (SYNCH) :\tInvoke synchronous call") ACE_TEXT(" (ro_attrib())\n"))); diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl index 32e1c4e18cf..e43273a447d 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.idl @@ -12,7 +12,7 @@ #pragma ciao lem "Hello_MyFoo_objE.idl" #pragma ciao ami4ccm interface "Hello::MyFoo_obj" #pragma ciao lem "Hello_MyFoo_objAE.idl" -//needed for 'uses multiple', not used in this example +//needed for 'uses multiple', not used in this example #pragma ciao ami4ccm idl "Hello_MyFoo_objA.idl" module Hello diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp index 2c190b1497b..1d37ed32e79 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.cpp @@ -32,26 +32,26 @@ namespace CIAO_Hello_Receiver_comp_Impl { - + // TAO_IDL - Generated from // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exs.cpp:75 //============================================================ // Facet Executor Implementation Class: do_my_foo_exec_i //============================================================ - + do_my_foo_exec_i::do_my_foo_exec_i ( ::Hello::CCM_Receiver_comp_Context_ptr ctx) : ciao_context_ ( ::Hello::CCM_Receiver_comp_Context::_duplicate (ctx)) { } - + do_my_foo_exec_i::~do_my_foo_exec_i (void) { } - + // Operations from ::Hello::MyFoo_obj - + ::CORBA::Long do_my_foo_exec_i::foo ( const char * /* in_str */, @@ -60,51 +60,51 @@ namespace CIAO_Hello_Receiver_comp_Impl /* Your code here. */ return 0; } - + void do_my_foo_exec_i::hello ( ::CORBA::Long_out /* answer */) { /* Your code here. */ } - + ::CORBA::Short do_my_foo_exec_i::rw_attrib (void) { /* Your code here. */ return 0; } - + void do_my_foo_exec_i::rw_attrib ( ::CORBA::Short /* rw_attrib */) { /* Your code here. */ } - + ::CORBA::Short do_my_foo_exec_i::ro_attrib (void) { /* Your code here. */ return 0; } - + //============================================================ // Component Executor Implementation Class: Receiver_comp_exec_i //============================================================ - + Receiver_comp_exec_i::Receiver_comp_exec_i (void) { } - + Receiver_comp_exec_i::~Receiver_comp_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::Hello::CCM_MyFoo_obj_ptr Receiver_comp_exec_i::get_do_my_foo (void) { @@ -116,64 +116,64 @@ namespace CIAO_Hello_Receiver_comp_Impl do_my_foo_exec_i ( this->ciao_context_.in ()), ::Hello::CCM_MyFoo_obj::_nil ()); - + this->ciao_do_my_foo_ = tmp; } - + return ::Hello::CCM_MyFoo_obj::_duplicate ( this->ciao_do_my_foo_.in ()); } - + // Operations from Components::SessionComponent. - + void Receiver_comp_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->ciao_context_ = ::Hello::CCM_Receiver_comp_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Receiver_comp_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Receiver_comp_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Receiver_comp_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Receiver_comp_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" ::Components::EnterpriseComponent_ptr create_Hello_Receiver_comp_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Receiver_comp_exec_i); - + return retval; } } diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp index a8dca0569ce..d512ef18eac 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Sender_comp_exec.cpp @@ -35,68 +35,68 @@ namespace CIAO_Hello_Sender_comp_Impl //============================================================ // Component Executor Implementation Class: Sender_comp_exec_i //============================================================ - + Sender_comp_exec_i::Sender_comp_exec_i (void) { } - + Sender_comp_exec_i::~Sender_comp_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + // Operations from Components::SessionComponent. - + void Sender_comp_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->ciao_context_ = ::Hello::CCM_Sender_comp_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Sender_comp_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Sender_comp_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Sender_comp_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Sender_comp_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" ::Components::EnterpriseComponent_ptr create_Hello_Sender_comp_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Sender_comp_exec_i); - + return retval; } } diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp index d05dfdae30c..b8b9fb7f846 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Sender_comp_exec.cpp @@ -132,7 +132,7 @@ namespace CIAO_Hello_Sender_comp_Impl MyFoo_obj_callback_exec_i::get_ro_attrib_excep ( ::CCM_AMI::ExceptionHolder * excep_holder) { - /* Your code here. */ + /* Your code here. */ excep_holder->raise_exception (); } @@ -206,7 +206,7 @@ namespace CIAO_Hello_Sender_comp_Impl out_str.out()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (foo)\n") - ACE_TEXT(" result <%u> answer <%C>\n"), + ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in())); CORBA::Long answer; @@ -233,7 +233,7 @@ namespace CIAO_Hello_Sender_comp_Impl ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ") ACE_TEXT("(rw_attrib(15))\n"))); - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Sender (SYNCH) :\tInvoke synchronous call") ACE_TEXT(" (ro_attrib())\n"))); diff --git a/CIAO/connectors/dds4ccm/docs/ccm_dds.idl b/CIAO/connectors/dds4ccm/docs/ccm_dds.idl index c0804409f0b..3301113a801 100644 --- a/CIAO/connectors/dds4ccm/docs/ccm_dds.idl +++ b/CIAO/connectors/dds4ccm/docs/ccm_dds.idl @@ -13,7 +13,7 @@ module CCM_DDS { // --------------------------- typedef unsigned long DataNumber_t; // count or index of data typedef sequence<DataNumber_t> DataNumberSeq; - + const DataNumber_t UNLIMITED = 0; enum AccessStatus { @@ -28,7 +28,7 @@ module CCM_DDS { INSTANCE_FILTERED_OUT, INSTANCE_DELETED }; - + struct ReadInfo { DDS::InstanceHandle_t instance_handle; DDS::Time_t source_timestamp; @@ -41,7 +41,7 @@ module CCM_DDS { string expression; DDS::StringSeq parameters; }; - + // Data Listener control // --------------------- enum ListenerMode { @@ -70,24 +70,24 @@ module CCM_DDS { // OUT_OF_RESOURCE (5) DataNumber_t index; // of the erroneous }; - + exception NonChangeable {}; - + // ---------- // Interfaces // ---------- - + // Listener Control // ---------------- local interface DataListenerControl { attribute ListenerMode mode; // default NOT_ENABLED attribute DataNumber_t max_delivered_data; // default 0 (no limit) }; - + local interface StateListenerControl : DataListenerControl { attribute boolean is_filter_interpreted; // default FALSE }; - + // Content Filter Parameters Setting // --------------------------------- local interface ContentFilterSetting { @@ -126,7 +126,7 @@ module CCM_DDS { in DDS::Entity the_entity, in DDS::StatusKind status_kind); }; - + // --------------- // Connector bases // --------------- @@ -144,26 +144,26 @@ module CCM_DDS { attribute DDS::StringSeq key_fields setraises (NonChangeable); }; - + // =================================================================================== // Typed sub-part // (here are placed all the construct that are depending on the data type // either directly or indirectly) // =================================================================================== - + module Typed <typename T, sequence<T> TSeq> { // Gathers all the constructs that are dependent on the data type (T), // either directly -- interfaces making use of T or TSeq, // or indirectly -- porttypes using or providing those intefaces. // TSeq is passed as a second parameter to avoid creating a new sequence type. - + // ------------------------------------- // Interfaces to be 'used' or 'provided' // ------------------------------------- // Data access - publishing side // ----------------------------- - + // -- InstanceHandle Manager local interface InstanceHandleManager { DDS::InstanceHandle_t register_instance (in T datum) @@ -187,7 +187,7 @@ module CCM_DDS { // - if is_coherent_write, DDS write orders issued by a write_many // are placed between begin/end coherent updates (even if an error occurs) }; - + // -- Updater: when the instance lifecycle is a concern local interface Updater : InstanceHandleManager { void create_one (in T datum) @@ -199,7 +199,7 @@ module CCM_DDS { void delete_one (in T datum,in DDS::InstanceHandle_t instance_handle) raises (NonExistent, InternalError); - + void create_many (in TSeq data) raises (AlreadyCreated, InternalError); @@ -209,11 +209,11 @@ module CCM_DDS { void delete_many (in TSeq data) raises (NonExistent, InternalError); - + attribute boolean is_global_scope // FALSE by default setraises (NonChangeable); attribute boolean is_coherent_write; // FALSE by default - + // behavior // -------- // - the handle is exactly managed as by DDS (cf. DDS spec for more details) @@ -235,7 +235,7 @@ module CCM_DDS { // Data access - subscribing side // ------------------------------ - + // -- Reader: to simply access to the available data (no wait) local interface Reader { void read_last (inout TSeq data, inout ReadInfoSeq infos) @@ -390,7 +390,7 @@ module CCM_DDS { uses DDS::DataReader dds_entity; provides PortStatusListener status; }; - + // ---------------------------- // Connectors // (Correspond to DDS patterns) diff --git a/CIAO/connectors/dds4ccm/docs/ccm_dds_dlrl.idl b/CIAO/connectors/dds4ccm/docs/ccm_dds_dlrl.idl index f373ab29197..a105aa06fd5 100644 --- a/CIAO/connectors/dds4ccm/docs/ccm_dds_dlrl.idl +++ b/CIAO/connectors/dds4ccm/docs/ccm_dds_dlrl.idl @@ -40,5 +40,5 @@ local interface CacheOperation { raises (DDS::PreconditionNotMet); }; }; - - + + diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp index e4b26b81f31..d2c9365af75 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Receiver/Hello_Receiver.cpp @@ -26,10 +26,10 @@ public: int ACE_TMAIN(int argc, ACE_TCHAR** argv) { HelloListener listener; - int main_result = 1; /* error by default */ + int main_result = 1; /* error by default */ ::DDS::Topic * topic = 0; ::DDS::DataReader *data_reader = 0; - + if (argc == 2) { char *end = 0; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp index c761e4e7b8f..0a54ebcaaa0 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp +++ b/CIAO/connectors/dds4ccm/examples/Hello/DDS_Sender/Hello_Sender.cpp @@ -101,12 +101,12 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { /* In this specific case, this will never fail */ goto clean_exit; } - + // Sleep a couple seconds to allow discovery to happen ACE_OS::sleep (1); - + /* --- Write Data ----------------------------------------------------- */ - + for (int i = 0; i < number_of_iterations; i++) { ACE_TCHAR timestamp[16]; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp index 53185c1a21d..34450e62e9e 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp @@ -252,7 +252,7 @@ namespace CIAO_Hello_Receiver_Impl { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - + throw ::CORBA::INTERNAL (); } lc->mode ( ::CCM_DDS::ONE_BY_ONE); diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml index 705e3d4edb5..43d7538106a 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="HelloTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. @@ -55,7 +55,7 @@ RTI Data Distribution Service user manual. <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> </datareader_qos> - + </qos_profile> </qos_library> </dds>
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp index 966b8427003..e174f399ce8 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub_exec.cpp @@ -8,64 +8,64 @@ namespace CIAO_DDS_Pub_Impl //============================================================ // Component Executor Implementation Class: DDS_Pub_exec_i //============================================================ - + DDS_Pub_exec_i::DDS_Pub_exec_i (void) { } - + DDS_Pub_exec_i::~DDS_Pub_exec_i (void) { } - + // Operations from Components::SessionComponent. - + void DDS_Pub_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::CCM_DDS_Pub_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void DDS_Pub_exec_i::configuration_complete (void) { /* Your code here. */ } - + void DDS_Pub_exec_i::ccm_activate (void) { /* Your code here. */ } - + void DDS_Pub_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void DDS_Pub_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" DDS_PUB_EXEC_Export ::Components::EnterpriseComponent_ptr create_DDS_Pub_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, DDS_Pub_exec_i); - + return retval; } } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp index efdca13b09c..2e620612de3 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp @@ -35,95 +35,95 @@ namespace CIAO_Single_Service_Impl //============================================================ // Facet Executor Implementation Class: Simple_Service_exec_i //============================================================ - + Simple_Service_exec_i::Simple_Service_exec_i (void) { } - + Simple_Service_exec_i::~Simple_Service_exec_i (void) { } - + // Operations from ::Simple_Service - + void Simple_Service_exec_i::ping (void) { /* Your code here. */ } - + //============================================================ // Component Executor Implementation Class: Single_Service_exec_i //============================================================ - + Single_Service_exec_i::Single_Service_exec_i (void) { } - + Single_Service_exec_i::~Single_Service_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::CCM_Simple_Service_ptr Single_Service_exec_i::get_ping_port (void) { /* Your code here. */ return ::CCM_Simple_Service::_nil (); } - + // Operations from Components::SessionComponent. - + void Single_Service_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::CCM_Single_Service_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Single_Service_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Single_Service_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Single_Service_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Single_Service_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" SINGLE_SERVICE_EXEC_Export ::Components::EnterpriseComponent_ptr create_Single_Service_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Single_Service_exec_i); - + return retval; } } diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl index e3045db3092..0c97fa9a6e8 100644 --- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl +++ b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl @@ -10,8 +10,8 @@ #include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl" #include "connectors/dds4ccm/idl/dds4ccm_Connector.idl" -#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" -#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_State_Connector_T.h" +#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" +#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_State_Connector_T.h" module CCM_DDS { diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp index e50c19b5922..ce5856b2651 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp @@ -34,7 +34,7 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_readcond (this->rd_condition_.in ()); if (!rc) { - DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO + DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO ACE_TEXT ("ConditionManager_T::get_readcondition - ") ACE_TEXT ("Unable to cast ::DDS::ReadCondition to its internal ") ACE_TEXT ("representation.\n"))); diff --git a/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp index 24225230edd..688a011a7a3 100644 --- a/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp @@ -96,7 +96,7 @@ namespace CIAO this->impl_->on_data_available ( this->typed_dr_); } - + template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE> void CCM_DDS_DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_subscription_matched ( diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp index bab6ca57aa2..af6c5d3b51e 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp @@ -16,7 +16,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DDS_Base_Connector_T (voi , profile_name_ (0) { DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DDS_Base_Connector_T"); - + ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), this->domain_id_); this->domain_id_ = id; } @@ -25,7 +25,7 @@ template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE> DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::~DDS_Base_Connector_T (void) { DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::~DDS_Base_Connector_T"); - + ACE_OS::free (library_name_); ACE_OS::free (profile_name_); @@ -193,7 +193,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::ccm_activate (void) ::DDS::ReturnCode_t const retcode = this->domain_participant_->set_listener ( this->domainparticipantlistener_.in (), DomainParticipantListener::get_mask ()); - + if (retcode != DDS_RETCODE_OK) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO @@ -247,7 +247,7 @@ ACE_Reactor* DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::reactor (void) { DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::reactor"); - + ACE_Reactor* reactor = 0; ::CORBA::Object_var ccm_object = this->context_->get_CCM_object(); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp index 61333d87417..02fad4dc038 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp @@ -55,7 +55,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate ( this->condition_manager_), ::CORBA::NO_MEMORY ()); } - + ::DDS::ReturnCode_t const retcode = this->data_reader_->set_listener ( this->listener_.in (), DataReaderListener_type::get_mask (status)); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp index 45f1ecdab7e..dc3b748bb04 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp @@ -9,7 +9,7 @@ #include "dds4ccm/impl/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE> -DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::DDS_StateListen_T (void) +DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::DDS_StateListen_T (void) { } @@ -35,7 +35,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complet subscriber, library_name, profile_name); - + this->data_control_->_set_component (component); } @@ -59,12 +59,12 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate ( this->condition_manager_), ::CORBA::NO_MEMORY ()); } - + ::DDS::ReturnCode_t const retcode = this->data_reader_->set_listener ( this->listener_.in (), DataReaderStateListener_type::get_mask (listener)); - + if (retcode != ::DDS::RETCODE_OK) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index 0e13e3e97a5..74271b69efe 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -81,7 +81,7 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate ( PortStatusListener_type (status, reactor), ::CORBA::NO_MEMORY ()); } - + ::DDS::ReturnCode_t const retcode = this->data_reader_->set_listener ( this->listener_.in (), PortStatusListener_type::get_mask (status)); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp index 934f5a05830..f7e91574b08 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp @@ -312,7 +312,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_subscriber reactor), ::CORBA::NO_MEMORY ()); } - + ::DDS::ReturnCode_t const retcode = this->subscriber_->set_listener ( this->subscriber_listener_.in (), SubscriberListener::get_mask ( diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp index 06790fd3198..0159739fbd9 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp @@ -9,7 +9,7 @@ #include "dds4ccm/impl/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE> -DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DDS_Update_T (void) +DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DDS_Update_T (void) { } @@ -104,10 +104,10 @@ void DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate () { DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate"); - + ::DDS::ReturnCode_t const retcode = this->ccm_dds_writer_->set_listener (::DDS::DataWriterListener::_nil (), 0); - + if (retcode != ::DDS::RETCODE_OK) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp index e451e480950..a45826ce7a1 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp @@ -8,7 +8,7 @@ #include "dds4ccm/impl/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE> -DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DDS_Write_T (void) +DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DDS_Write_T (void) { } @@ -82,11 +82,11 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate () DataWriterListener_type (), ::CORBA::NO_MEMORY ()); } - + ::DDS::ReturnCode_t const retcode = this->ccm_dds_writer_->set_listener (this->data_listener_.in (), DataWriterListener_type::get_mask ()); - + if (retcode != DDS::RETCODE_OK) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO @@ -105,7 +105,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::passivate () ::DDS::ReturnCode_t const retcode = this->ccm_dds_writer_->set_listener (::DDS::DataWriterListener::_nil (), 0); - + if (retcode != ::DDS::RETCODE_OK) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO @@ -127,7 +127,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::remove ( DDS::ReturnCode_t const retcode = publisher->delete_datawriter (this->ccm_dds_writer_); - + if (retcode == ::DDS::RETCODE_OK) { this->ccm_dds_writer_->set_impl (0); diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp index 084184da9c5..16c6acd51fd 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp @@ -230,7 +230,7 @@ namespace CIAO "type, bailing.\n")); return DDS::RETCODE_ERROR; } - + DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_CAST_SUCCESSFUL, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_T" "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_participant - " @@ -244,7 +244,7 @@ namespace CIAO "CCM_DDS_DomainParticipantFactory_T" "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_participant - " "Going to delete participant.\n")); - + retval = DDSDomainParticipantFactory::get_instance ()-> delete_participant (part->get_impl ()); diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp index f4abb8d48cc..2aaf1e76fef 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp @@ -120,7 +120,7 @@ namespace CIAO DomainParticipantManager::~DomainParticipantManager (void) { DDS4CCM_TRACE ("DomainParticipantManager::~DomainParticipantManager"); - + DDSDomainParticipantFactory::finalize_instance (); } @@ -229,7 +229,7 @@ namespace CIAO if (iter->second->_ref_count () == 1) { delete iter->second; - + // Save to remove from list this->dps_.erase (iter); } @@ -252,7 +252,7 @@ namespace CIAO DDSTopic * tp) { DDS4CCM_TRACE ("DomainParticipantManager::_inc_ref"); - DomainParticipants_iterator iter = + DomainParticipants_iterator iter = this->get_participanttopic_by_participant (dp); if (iter != this->dps_.end ()) { diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp index 66697d9f659..fd00af6a6f2 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp @@ -392,7 +392,7 @@ namespace CIAO DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT; - DDSTopicDescription * dds_td = + DDSTopicDescription * dds_td = this->impl ()->lookup_topicdescription (impl_name); DDSTopic * dds_tp = 0; if (dds_td) @@ -495,7 +495,7 @@ namespace CIAO ::CORBA::NO_MEMORY ()); } - DDSTopicDescription * dds_td = + DDSTopicDescription * dds_td = this->impl ()->lookup_topicdescription (impl_name); DDSTopic * dds_tp = 0; if (dds_td) diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp index 74512e94e3b..cdb36d0c0d8 100644 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp @@ -21,7 +21,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::~Reade DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::~Reader_T"); } -/// For the requirement : 'samples ordered by instances' the following settings +/// For the requirement : 'samples ordered by instances' the following settings /// are necessary: ordered_access -> true and /// DDS_INSTANCE_PRESENTATION_QOS (default) template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE> diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl index 29fea75eef2..b7ed46b9db4 100755 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl @@ -37,7 +37,7 @@ sub run_tests { print "Start sender with QoS profile <$qos>\n"; $S = $tg_sender->CreateProcess ("$DDS4CCM_ROOT/performance-tests/DDSLatency/DDS_Sender/DDS_Sender", "-q $qos $rw_extra"); - + $S->SpawnWaitKill ($tg_sender->ProcessStartWaitInterval () + 180); $R->Kill (); } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml index eed9024cd6d..f54a35d50b6 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="HelloTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. @@ -47,7 +47,7 @@ RTI Data Distribution Service user manual. </property> </participant_qos> </qos_profile> - + <qos_profile name="ThroughputQoS" is_default_qos="true"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> @@ -101,7 +101,7 @@ RTI Data Distribution Service user manual. </durability> </datareader_qos> </qos_profile> - + <qos_profile name="ThroughputCmdQoS" is_default_qos="true"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl index b5ac3c307cb..784f43a3ff9 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl @@ -18,7 +18,7 @@ module Perf_Keyed_Test component Sender { port CCM_DDS::PerfKeyedTest::DDS_Write info_write; - attribute unsigned short keys; + attribute unsigned short keys; attribute unsigned long iterations; attribute unsigned short latency_count; //number of samples sent before a latency ping packet is sent. default 100000, < sample_count attribute unsigned short sleep; //time in ms to sleep between each send diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml index 9b472b3f879..d443bda6b0a 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="HelloTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. @@ -73,7 +73,7 @@ RTI Data Distribution Service user manual. <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> </datareader_qos> - + </qos_profile> <qos_profile name="BestEffortQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl index 8e86adfc33a..23d5baafec5 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl @@ -22,7 +22,7 @@ module LatencyTT_Test provides CCM_DDS::ConnectorStatusListener connector_status; attribute unsigned long iterations; - attribute unsigned short sleep; + attribute unsigned short sleep; attribute unsigned short number_of_sub; //number of subscribers }; }; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml index bcb9f6abbe0..add697e04e0 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="HelloTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. @@ -78,7 +78,7 @@ RTI Data Distribution Service user manual. </durability> </datareader_qos> </qos_profile> - + <qos_profile name="ThroughputCmdQoS" is_default_qos="true"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml index 0ce3f46ffdf..9e65a2d9791 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="HelloTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. @@ -73,7 +73,7 @@ RTI Data Distribution Service user manual. </period> </deadline> </datareader_qos> - + </qos_profile> </qos_library> </dds>
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml index 00209f072de..c9854242d2d 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="QoSTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml index 2ebc1749f3f..4ff54ed4696 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -This file is used to create a situation which causes an on_rejected_sample event. +This file is used to create a situation which causes an on_rejected_sample event. -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -22,7 +22,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="HelloTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. @@ -121,7 +121,7 @@ RTI Data Distribution Service user manual. </autopurge_disposed_samples_delay> </reader_data_lifecycle> </datareader_qos> - + </qos_profile> </qos_library> </dds>
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml index 72769833b96..3a5ec919a41 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="CSL_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml index a19958a9ef2..44b16788852 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="CoherentUpdater_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml index 97da5d0ee8a..f5d92aee226 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="CoherentWriter_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp index 478a55d43f7..e6bffd32df2 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp @@ -6,7 +6,7 @@ xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> <label>ReadGet_Test_Depl_1</label> <UUID>ReadGet_Test_Depl_1</UUID> - + <implementation xmi:id="ReceiverComponentImplementation"> <name>ReceiverComponentImplementation</name> <source/> @@ -58,7 +58,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="ReadGet_Test_ReceiverConnectorImplementation"> <name>ReadGet_Test_ReceiverConnectorImplementation</name> <source/> @@ -215,7 +215,7 @@ <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" /> </internalEndpoint> </connection> - + <artifact xmi:id="ReadGet_Test_Connector_ExecArtifact"> <name>CFT_ReadGet_Test_Connector_exec</name> <source/> diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp index f0a50d5cc44..a2100315989 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp @@ -706,7 +706,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl // iterations of the first run are also received during the // second run // The last addition is from the read action on the getter port. - // During the first run, two samples are received. The second run + // During the first run, two samples are received. The second run // includes the two samples from the first run and 11 samples (22-34) // from the second run. this->samples_expected_reader_ = diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml index 5b00bed1712..68c9a0e8f5e 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="QueryCondition_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp index 35c994fda77..9c41cefbe81 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp @@ -156,7 +156,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl ACE_TEXT ("getter_data\n"))); } catch (...) - { + { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") ACE_TEXT ("Unknown exception caught while testing ") ACE_TEXT ("getter_data\n"))); @@ -195,7 +195,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") ACE_TEXT ("CORBA exception caught while testing ") ACE_TEXT ("getter_fresh_data\n"))); - } + } catch (...) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp index 14af46203af..eca407029ce 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp @@ -110,7 +110,7 @@ namespace CIAO_Getter_Test_Sender_Impl this->context_->get_connection_info_write_data (); GetInvoker_var invoker = this->context_->get_connection_invoke_getter (); - + GetterTestSeq write_many (this->keys_ * this->iterations_); write_many.length (this->keys_ * this->iterations_); for (CORBA::UShort key = 1; key < this->keys_ + 1; ++key) diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml index 2cf94303049..53ba064c898 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="KeyedWriter_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml index 13300496572..c90bc9996f5 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="ListenManyByMany_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml index 37f1d6e8359..619f00e7904 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="Deadline_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml index d263487191a..01399077d83 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="HelloTest_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. @@ -83,7 +83,7 @@ RTI Data Distribution Service user manual. </period> </deadline> </datareader_qos> - + </qos_profile> </qos_library> </dds>
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp index ee02d9aa09c..b044bd8f565 100644 --- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp +++ b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp @@ -12,5 +12,5 @@ bool LifespanPolicyTest::check (const ::DDS_LifespanQosPolicy & dds_qos, const ::DDS::LifespanQosPolicy & qos) { - return Duration::check (dds_qos.duration, qos.duration); + return Duration::check (dds_qos.duration, qos.duration); } diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp index a7aaecc132f..162301f6dc8 100644 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp @@ -35,7 +35,7 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl ::DDS::DataReader_ptr /*the_reader*/, const DDS::RequestedIncompatibleQosStatus & /*status*/) { - } + } void ConnectorStatusListener_exec_i::on_sample_rejected ( ::DDS::DataReader_ptr /*the_reader*/, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml index b221cf9f640..791dc49ad5e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -22,7 +22,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="QueryCondition_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml index 5b00bed1712..68c9a0e8f5e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="QueryCondition_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml index 5b00bed1712..68c9a0e8f5e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="QueryCondition_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml index 5b00bed1712..68c9a0e8f5e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="QueryCondition_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml index 8406e3003a3..345a7457ea0 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- +<!-- Description -XML QoS Profile +XML QoS Profile -The QoS configuration of the DDS entities in the generated example is +The QoS configuration of the DDS entities in the generated example is loaded from this file. This file is used only when it is in the current working directory or when the enviroment variable NDDS_QOS_PROFILES is defined and points to this file. -For more information about XML QoS Profiles see Chapter 15 in the +For more information about XML QoS Profiles see Chapter 15 in the RTI Data Distribution Service user manual. --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> @@ -20,7 +20,7 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> <qos_library name="Reader_Library"> - <!-- QoS profile used to configure reliable communication between the DataWriter + <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp index 152ec750492..7c08f3a9e90 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp @@ -193,7 +193,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw ::CORBA::INTERNAL (); } - + lc->mode (::CCM_DDS::ONE_BY_ONE); } diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp index 35b3c963176..a1641ddd172 100644 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp @@ -203,7 +203,7 @@ namespace CIAO_UCC_Test_UCCTestComponent_Impl this->var_samples_.clear (); this->fixed_samples_.clear (); - + // Check count_ if (UCCFixedSizedStructTest_i::count_ != 0) { @@ -227,7 +227,7 @@ namespace CIAO_UCC_Test_UCCTestComponent_Impl ACE_DEBUG ((LM_DEBUG, "Reference count for variable sized " "samples is 0\n")); } - + // Check max_count_, for each sample we allocated an instance so we // expect a count of 10 if (UCCFixedSizedStructTest_i::max_count_ != 10) diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp index d6b2d26de51..77a38feea49 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp @@ -110,7 +110,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="VT_String_ConnectorComponentImplementation"> <name>VT_String_ConnectorComponentImplementation</name> <source/> @@ -518,7 +518,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="VT_String_ConnectorComponentInstance"> <name>VT_String_ConnectorComponent</name> <node>SenderNode</node> diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp index 94e1f1cb3f8..8d8877af214 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp @@ -110,7 +110,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="VTS_String_ConnectorComponentImplementation"> <name>VTS_String_ConnectorComponentImplementation</name> <source/> @@ -318,7 +318,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="VT_X_Union_ConnectorComponentImplementation"> <name>VT_X_Union_ConnectorComponentImplementation</name> <source/> @@ -466,7 +466,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="VTS_String_ConnectorComponentInstance"> <name>VTS_String_ConnectorComponent</name> <node>SenderNode</node> @@ -614,7 +614,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="VT_X_Union_ConnectorComponentInstance"> <name>VT_X_Union_ConnectorComponent</name> <node>SenderNode</node> @@ -1035,7 +1035,7 @@ <node/> <location>DDS_VTS_Array_Connector_stub</location> </artifact> - + <artifact xmi:id="VTS_Seq_Connector_ExecArtifact"> <name>VTS_Seq_Connector_exec</name> <source/> diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp index 2174154bbb5..263d1c836bf 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp @@ -35,138 +35,138 @@ namespace CIAO_Shapes_Control_comp_Impl //============================================================ // Component Executor Implementation Class: Control_comp_exec_i //============================================================ - + Control_comp_exec_i::Control_comp_exec_i (void) { } - + Control_comp_exec_i::~Control_comp_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::CORBA::ULong Control_comp_exec_i::rate (void) { /* Your code here. */ return 0; } - + void Control_comp_exec_i::rate ( ::CORBA::ULong /* rate */) { /* Your code here. */ } - + ::CORBA::UShort Control_comp_exec_i::max_x (void) { /* Your code here. */ return 0; } - + void Control_comp_exec_i::max_x ( ::CORBA::UShort /* max_x */) { /* Your code here. */ } - + ::CORBA::UShort Control_comp_exec_i::max_y (void) { /* Your code here. */ return 0; } - + void Control_comp_exec_i::max_y ( ::CORBA::UShort /* max_y */) { /* Your code here. */ } - + ::CORBA::UShort Control_comp_exec_i::max_size (void) { /* Your code here. */ return 0; } - + void Control_comp_exec_i::max_size ( ::CORBA::UShort /* max_size */) { /* Your code here. */ } - + ::CORBA::Boolean Control_comp_exec_i::resize_shape (void) { /* Your code here. */ return false; } - + void Control_comp_exec_i::resize_shape ( ::CORBA::Boolean /* resize_shape */) { /* Your code here. */ } - + // Operations from Components::SessionComponent. - + void Control_comp_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->ciao_context_ = ::Shapes::CCM_Control_comp_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Control_comp_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Control_comp_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Control_comp_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Control_comp_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" ::Components::EnterpriseComponent_ptr create_Shapes_Control_comp_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Control_comp_exec_i); - + return retval; } } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp index a87a91047a0..da5921b7999 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.cpp @@ -32,26 +32,26 @@ namespace CIAO_Shapes_Receiver_comp_Impl { - + // TAO_IDL - Generated from // be/be_visitor_component/facet_exs.cpp:75 //============================================================ // Facet Executor Implementation Class: info_out_data_listener_exec_i //============================================================ - + info_out_data_listener_exec_i::info_out_data_listener_exec_i ( ::Shapes::CCM_Receiver_comp_Context_ptr ctx) : ciao_context_ ( ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx)) { } - + info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) { } - + // Operations from ::Shapes::ShapeType_conn::Listener - + void info_out_data_listener_exec_i::on_one_data ( const ::ShapeType & /* datum */, @@ -59,7 +59,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl { /* Your code here. */ } - + void info_out_data_listener_exec_i::on_many_data ( const ::Shapes::ShapeTypeSeq & /* data */, @@ -67,26 +67,26 @@ namespace CIAO_Shapes_Receiver_comp_Impl { /* Your code here. */ } - + // TAO_IDL - Generated from // be/be_visitor_component/facet_exs.cpp:75 //============================================================ // Facet Executor Implementation Class: info_out_status_exec_i //============================================================ - + info_out_status_exec_i::info_out_status_exec_i ( ::Shapes::CCM_Receiver_comp_Context_ptr ctx) : ciao_context_ ( ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx)) { } - + info_out_status_exec_i::~info_out_status_exec_i (void) { } - + // Operations from ::CCM_DDS::PortStatusListener - + void info_out_status_exec_i::on_requested_deadline_missed ( ::DDS::DataReader_ptr /* the_reader */, @@ -94,7 +94,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl { /* Your code here. */ } - + void info_out_status_exec_i::on_sample_lost ( ::DDS::DataReader_ptr /* the_reader */, @@ -105,19 +105,19 @@ namespace CIAO_Shapes_Receiver_comp_Impl //============================================================ // Component Executor Implementation Class: Receiver_comp_exec_i //============================================================ - + Receiver_comp_exec_i::Receiver_comp_exec_i (void) { } - + Receiver_comp_exec_i::~Receiver_comp_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::Shapes::ShapeType_conn::CCM_Listener_ptr Receiver_comp_exec_i::get_info_out_data_listener (void) { @@ -129,15 +129,15 @@ namespace CIAO_Shapes_Receiver_comp_Impl info_out_data_listener_exec_i ( this->ciao_context_.in ()), ::Shapes::ShapeType_conn::CCM_Listener::_nil ()); - + this->ciao_info_out_data_listener_ = tmp; } - + return ::Shapes::ShapeType_conn::CCM_Listener::_duplicate ( this->ciao_info_out_data_listener_.in ()); } - + ::CCM_DDS::CCM_PortStatusListener_ptr Receiver_comp_exec_i::get_info_out_status (void) { @@ -149,64 +149,64 @@ namespace CIAO_Shapes_Receiver_comp_Impl info_out_status_exec_i ( this->ciao_context_.in ()), ::CCM_DDS::CCM_PortStatusListener::_nil ()); - + this->ciao_info_out_status_ = tmp; } - + return ::CCM_DDS::CCM_PortStatusListener::_duplicate ( this->ciao_info_out_status_.in ()); } - + // Operations from Components::SessionComponent. - + void Receiver_comp_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->ciao_context_ = ::Shapes::CCM_Receiver_comp_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Receiver_comp_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Receiver_comp_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Receiver_comp_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Receiver_comp_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" ::Components::EnterpriseComponent_ptr create_Shapes_Receiver_comp_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Receiver_comp_exec_i); - + return retval; } } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp index c1aa075c9fc..92b279d15df 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.cpp @@ -32,26 +32,26 @@ namespace CIAO_Shapes_Sender_comp_Impl { - + // TAO_IDL - Generated from // be/be_visitor_component/facet_exs.cpp:75 //============================================================ // Facet Executor Implementation Class: control_exec_i //============================================================ - + control_exec_i::control_exec_i ( ::Shapes::CCM_Sender_comp_Context_ptr ctx) : ciao_context_ ( ::Shapes::CCM_Sender_comp_Context::_duplicate (ctx)) { } - + control_exec_i::~control_exec_i (void) { } - + // Operations from ::Shapes::Control_obj - + ::Shapes::ReturnStatus control_exec_i::setSize ( ::CORBA::UShort /* size */) @@ -59,7 +59,7 @@ namespace CIAO_Shapes_Sender_comp_Impl /* Your code here. */ return static_cast< ::Shapes::ReturnStatus> (0UL); } - + ::Shapes::ReturnStatus control_exec_i::setLocation ( ::CORBA::UShort /* x */, @@ -68,23 +68,23 @@ namespace CIAO_Shapes_Sender_comp_Impl /* Your code here. */ return static_cast< ::Shapes::ReturnStatus> (0UL); } - + //============================================================ // Component Executor Implementation Class: Sender_comp_exec_i //============================================================ - + Sender_comp_exec_i::Sender_comp_exec_i (void) { } - + Sender_comp_exec_i::~Sender_comp_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::Shapes::CCM_Control_obj_ptr Sender_comp_exec_i::get_control (void) { @@ -96,64 +96,64 @@ namespace CIAO_Shapes_Sender_comp_Impl control_exec_i ( this->ciao_context_.in ()), ::Shapes::CCM_Control_obj::_nil ()); - + this->ciao_control_ = tmp; } - + return ::Shapes::CCM_Control_obj::_duplicate ( this->ciao_control_.in ()); } - + // Operations from Components::SessionComponent. - + void Sender_comp_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->ciao_context_ = ::Shapes::CCM_Sender_comp_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Sender_comp_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Sender_comp_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Sender_comp_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Sender_comp_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" ::Components::EnterpriseComponent_ptr create_Shapes_Sender_comp_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Sender_comp_exec_i); - + return retval; } } diff --git a/CIAO/docs/CIAO_Style_Guide.txt b/CIAO/docs/CIAO_Style_Guide.txt index 28c3245bc76..7df9afbea3a 100644 --- a/CIAO/docs/CIAO_Style_Guide.txt +++ b/CIAO/docs/CIAO_Style_Guide.txt @@ -1,6 +1,6 @@ Error/Debug messages ======================== -ciao_debug_level () and associated environment are no longer used. +ciao_debug_level () and associated environment are no longer used. Instead, there are error message levels, in order from least to most severe: @@ -15,7 +15,7 @@ LM_ALERT LM_EMERGENCY Please use the full range. Severity LM_TRACE through LM_NOTICE should -use ACE_DEBUG. LM_WARNING through LM_EMERGENCY should use ACE_ERROR. +use ACE_DEBUG. LM_WARNING through LM_EMERGENCY should use ACE_ERROR. The verbosity of the logging output, i.e. which severity of logging messages are output, is configured at runtime from the command line of @@ -31,12 +31,12 @@ to report subactions (e.g. activiation of ports, establishment of connections), and LM_NOTICE should be used to report significant actions (e.g., component installation complete, container creation). -Debug messages should begin with "ClassName::MethodName - ". +Debug messages should begin with "ClassName::MethodName - ". There is a macro in CIAO_common.h called CLINFO. This macro expands to a set of default log message decorators, and should be prepended to any and all debug messages and error messages, e.g.: -ACE_DEBUG((LM_INFO, CLINFO +ACE_DEBUG((LM_INFO, CLINFO "Servant_Activator::etherialize - Your message here")); It is VERY IMPORTANT to follow this format for EVERY MESSAGE to make diff --git a/CIAO/examples/BasicSP/EC/EC.idl b/CIAO/examples/BasicSP/EC/EC.idl index 61b1ef2fc5d..3d87e64013c 100644 --- a/CIAO/examples/BasicSP/EC/EC.idl +++ b/CIAO/examples/BasicSP/EC/EC.idl @@ -21,7 +21,7 @@ module BasicSP void start (); void stop (); }; - + component EC supports trigger { publishes TimeOut timeout_value; diff --git a/CIAO/examples/BasicSP/EC/EC_exec.cpp b/CIAO/examples/BasicSP/EC/EC_exec.cpp index 732c04cd41c..0a87cc1e696 100644 --- a/CIAO/examples/BasicSP/EC/EC_exec.cpp +++ b/CIAO/examples/BasicSP/EC/EC_exec.cpp @@ -237,11 +237,11 @@ create_BasicSP_EC_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_RETURN (retval, MyImpl::EC_exec_i, ::Components::EnterpriseComponent::_nil ()); - + return retval; } diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl b/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl index 67bb016e157..3833c77df83 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl +++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator.idl @@ -13,7 +13,7 @@ #include "Runnable.idl" #include "Publication.idl" -component Administrator { +component Administrator { uses multiple Runnable runnables; uses multiple Publication content; }; diff --git a/CIAO/examples/DevGuideExamples/Messenger/History.idl b/CIAO/examples/DevGuideExamples/Messenger/History.idl index 96dfac9fa05..4853cbc863f 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/History.idl +++ b/CIAO/examples/DevGuideExamples/Messenger/History.idl @@ -10,9 +10,9 @@ #define HISTORY_IDL #include "Message.idl" - + #pragma ciao lem "HistoryE.idl" - + interface History { Messages get_all(); Message get_latest(); diff --git a/CIAO/examples/DevGuideExamples/Messenger/Message.idl b/CIAO/examples/DevGuideExamples/Messenger/Message.idl index 2e3aee687b0..6016ca1f249 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Message.idl +++ b/CIAO/examples/DevGuideExamples/Messenger/Message.idl @@ -17,5 +17,5 @@ eventtype Message { public string text; }; typedef sequence<Message> Messages; - + #endif diff --git a/CIAO/examples/DevGuideExamples/Messenger/Publication.idl b/CIAO/examples/DevGuideExamples/Messenger/Publication.idl index 2eee03efecd..ea8ec6ffa4e 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Publication.idl +++ b/CIAO/examples/DevGuideExamples/Messenger/Publication.idl @@ -14,6 +14,6 @@ interface Publication { attribute string text; attribute unsigned short period; -}; +}; #endif diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp index e80379cf6a8..67fa04e1fd8 100644 --- a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp +++ b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp @@ -36,20 +36,20 @@ namespace CIAO_Hello_Receiver_Impl //============================================================ // Component Executor Implementation Class: Receiver_exec_i //============================================================ - + Receiver_exec_i::Receiver_exec_i (void) : iterations_ (10) { } - + Receiver_exec_i::~Receiver_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + void Receiver_exec_i::push_click_in ( ::Hello::TimeOut * ev) @@ -71,14 +71,14 @@ namespace CIAO_Hello_Receiver_Impl ACE_OS::sleep (tv); } } - + ::CORBA::Short Receiver_exec_i::iterations (void) { /* Your code here. */ return this->iterations_; } - + void Receiver_exec_i::iterations ( ::CORBA::Short iterations) @@ -86,9 +86,9 @@ namespace CIAO_Hello_Receiver_Impl /* Your code here. */ this->iterations_ = iterations; } - + // Operations from Components::SessionComponent. - + void Receiver_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) @@ -97,13 +97,13 @@ namespace CIAO_Hello_Receiver_Impl this->context_ = ::Hello::CCM_Receiver_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Receiver_exec_i::configuration_complete (void) { @@ -111,38 +111,38 @@ namespace CIAO_Hello_Receiver_Impl ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::configuration_complete\n")); } - + void Receiver_exec_i::ccm_activate (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate\n")); } - + void Receiver_exec_i::ccm_passivate (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate\n")); } - + void Receiver_exec_i::ccm_remove (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove\n")); } - + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Hello_Receiver_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Receiver_exec_i); - + return retval; } } @@ -152,47 +152,47 @@ namespace CIAO_Hello_Receiver_Impl //============================================================ // Home Executor Implementation Class: ReceiverHome_exec_i //============================================================ - + ReceiverHome_exec_i::ReceiverHome_exec_i (void) { } - + ReceiverHome_exec_i::~ReceiverHome_exec_i (void) { } - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + ::Components::EnterpriseComponent_ptr ReceiverHome_exec_i::create (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_THROW_EX ( retval, Receiver_exec_i, ::CORBA::NO_MEMORY ()); - + return retval; } - + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Hello_ReceiverHome_Impl (void) { ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); - + ACE_NEW_NORETURN ( retval, ReceiverHome_exec_i); - + return retval; } } diff --git a/CIAO/examples/Null_Component/Null_Component_exec.cpp b/CIAO/examples/Null_Component/Null_Component_exec.cpp index ac15e45c66c..7fb0db8c876 100644 --- a/CIAO/examples/Null_Component/Null_Component_exec.cpp +++ b/CIAO/examples/Null_Component/Null_Component_exec.cpp @@ -36,95 +36,95 @@ namespace CIAO_Null_Component_Impl //============================================================ // Facet Executor Implementation Class: Null_Interface_exec_i //============================================================ - + Null_Interface_exec_i::Null_Interface_exec_i (void) { } - + Null_Interface_exec_i::~Null_Interface_exec_i (void) { } - + // Operations from ::Null_Interface - + void Null_Interface_exec_i::null_operation (void) { /* Your code here. */ } - + //============================================================ // Component Executor Implementation Class: Null_Component_exec_i //============================================================ - + Null_Component_exec_i::Null_Component_exec_i (void) { } - + Null_Component_exec_i::~Null_Component_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::CCM_Null_Interface_ptr Null_Component_exec_i::get_null_facet (void) { /* Your code here. */ return ::CCM_Null_Interface::_nil (); } - + // Operations from Components::SessionComponent. - + void Null_Component_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::CCM_Null_Component_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Null_Component_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Null_Component_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Null_Component_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Null_Component_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr create_Null_Component_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Null_Component_exec_i); - + return retval; } } @@ -134,47 +134,47 @@ namespace CIAO_Null_Component_Impl //============================================================ // Home Executor Implementation Class: Null_ComponentHome_exec_i //============================================================ - + Null_ComponentHome_exec_i::Null_ComponentHome_exec_i (void) { } - + Null_ComponentHome_exec_i::~Null_ComponentHome_exec_i (void) { } - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + ::Components::EnterpriseComponent_ptr Null_ComponentHome_exec_i::create (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_THROW_EX ( retval, Null_Component_exec_i, ::CORBA::NO_MEMORY ()); - + return retval; } - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr create_Null_ComponentHome_Impl (void) { ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); - + ACE_NEW_NORETURN ( retval, Null_ComponentHome_exec_i); - + return retval; } } diff --git a/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp b/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp index 3445c42a8e1..9f8b9db2455 100644 --- a/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp +++ b/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp @@ -74,7 +74,7 @@ </value> </value> </execParameter> - </implementation> + </implementation> <instance xmi:id="Null_ComponentHomeInstance"> <name>Null_ComponentHome</name> <node>NodeOne</node> @@ -117,5 +117,5 @@ <source/> <node/> <location>Null_Component_stub</location> - </artifact> + </artifact> </Deployment:DeploymentPlan> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp b/CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp index 76c89a82c38..f14b91c6e85 100644 --- a/CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp +++ b/CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp @@ -82,5 +82,5 @@ <source/> <node/> <location>Null_Component_stub</location> -</artifact> +</artifact> </Deployment:DeploymentPlan>
\ No newline at end of file diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp index ac15e45c66c..7fb0db8c876 100644 --- a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp +++ b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp @@ -36,95 +36,95 @@ namespace CIAO_Null_Component_Impl //============================================================ // Facet Executor Implementation Class: Null_Interface_exec_i //============================================================ - + Null_Interface_exec_i::Null_Interface_exec_i (void) { } - + Null_Interface_exec_i::~Null_Interface_exec_i (void) { } - + // Operations from ::Null_Interface - + void Null_Interface_exec_i::null_operation (void) { /* Your code here. */ } - + //============================================================ // Component Executor Implementation Class: Null_Component_exec_i //============================================================ - + Null_Component_exec_i::Null_Component_exec_i (void) { } - + Null_Component_exec_i::~Null_Component_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::CCM_Null_Interface_ptr Null_Component_exec_i::get_null_facet (void) { /* Your code here. */ return ::CCM_Null_Interface::_nil (); } - + // Operations from Components::SessionComponent. - + void Null_Component_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::CCM_Null_Component_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Null_Component_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Null_Component_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Null_Component_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Null_Component_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr create_Null_Component_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Null_Component_exec_i); - + return retval; } } @@ -134,47 +134,47 @@ namespace CIAO_Null_Component_Impl //============================================================ // Home Executor Implementation Class: Null_ComponentHome_exec_i //============================================================ - + Null_ComponentHome_exec_i::Null_ComponentHome_exec_i (void) { } - + Null_ComponentHome_exec_i::~Null_ComponentHome_exec_i (void) { } - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + ::Components::EnterpriseComponent_ptr Null_ComponentHome_exec_i::create (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_THROW_EX ( retval, Null_Component_exec_i, ::CORBA::NO_MEMORY ()); - + return retval; } - + extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr create_Null_ComponentHome_Impl (void) { ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); - + ACE_NEW_NORETURN ( retval, Null_ComponentHome_exec_i); - + return retval; } } diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp index cdf55717b8b..95ebe2fb54e 100644 --- a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp +++ b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp @@ -74,7 +74,7 @@ </value> </value> </execParameter> -</implementation> +</implementation> <instance xmi:id="Null_ComponentHomeInstance"> <name>Null_ComponentHome</name> <node>NodeOne</node> @@ -117,5 +117,5 @@ <source/> <node/> <location>Null_Component_stub</location> -</artifact> +</artifact> </Deployment:DeploymentPlan> diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp index 76c89a82c38..f14b91c6e85 100644 --- a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp +++ b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp @@ -82,5 +82,5 @@ <source/> <node/> <location>Null_Component_stub</location> -</artifact> +</artifact> </Deployment:DeploymentPlan>
\ No newline at end of file diff --git a/CIAO/performance-tests/Benchmark/Benchmark.idl b/CIAO/performance-tests/Benchmark/Benchmark.idl index 9323d071455..6890e23b48b 100644 --- a/CIAO/performance-tests/Benchmark/Benchmark.idl +++ b/CIAO/performance-tests/Benchmark/Benchmark.idl @@ -20,7 +20,7 @@ module Benchmark * @interface RoundTrip * * This Latency test provides operations to measure the round-trip - * latency of the ORB. The interface is the same as that of + * latency of the ORB. The interface is the same as that of * $TAO_ROOT/performance-tests/Latency/Single_Threaded */ @@ -37,7 +37,7 @@ module Benchmark * * This interface is used to start the tests. */ - interface Controller + interface Controller { /// Start the test void start (); diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt b/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt index a0ae140a0ee..e1ed8e75a32 100644 --- a/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt +++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt @@ -2,7 +2,7 @@ $Id$ PRE Condition: ============= -This test assumes that there is an appropriate svc.conf file present in +This test assumes that there is an appropriate svc.conf file present in $CIAO_ROOOT/tools/ComponentServer. Moreover, the Component Server does not curerntly expose interfaces to configure multi-threading. Hence, this experiment, will produce the desired results *only* when this feature has been @@ -11,5 +11,5 @@ added in CIAO. Till then, the server will run in single-threaded mode. Similarly, the client also requires the svc.conf file that enables multi-threading. This file is present in this directory. -The svc.conf file required for this experiment can be obtained from +The svc.conf file required for this experiment can be obtained from $TAO_ROOT/performance-tests/Latency/Thread_Pool diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp index 0d8e0b2b4d7..f4cf8a52c08 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp @@ -30,13 +30,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) = orb->string_to_object (ior); Benchmark::RoundTripClient_var test = Benchmark::RoundTripClient::_narrow(obj.in()); - + if (CORBA::is_nil (test.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire RoundTripClient objref\n"), -1); // Get the RoundTrip reference obj = test->provide_facet ("controller"); - Benchmark::Controller_var trigger = + Benchmark::Controller_var trigger = Benchmark::Controller::_narrow (obj.in ()); if (CORBA::is_nil (trigger.in ())) diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl b/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl index b7f83dbedd8..57af615669e 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl +++ b/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl @@ -1,5 +1,5 @@ // -// $Id$ +// $Id$ // /// Measure roundtrip delay diff --git a/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt b/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt index 7bcd2fbfade..a9b27abedd8 100644 --- a/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt +++ b/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt @@ -39,10 +39,10 @@ test.dat: the RoundTrip component on the location given in test.dat. RoundTripClient.cad : A descriptor file for the client component RoundTripClient that uses the interface provided by - RoundTrip. + RoundTrip. Test-IOR.cad: This cad file should be used to for testing a CORBA server with a CIAO client. The IOR of the server should added in - this file. + this file. There are automated perl scripts that can run the tests to generate the required results. These are located in the individual component directories @@ -50,7 +50,7 @@ Round Trip and RoundTripClient. The descriptors directory has the required .cad files that specify the component configuration used in the various experiments. -To run a simple CORBA component with a normal client: +To run a simple CORBA component with a normal client: cd descriptors; ../Roundtrip/run_test.pl @@ -60,6 +60,6 @@ To run a simple CORBA component with a normal client: server. Statistics are printed for RoundTrip latency jitter etc cd descritors; - ../RoundTripClient/run_test_ior_cad.pl - Script runs a CORBA server and a CIAO component that acts as a client. + ../RoundTripClient/run_test_ior_cad.pl + Script runs a CORBA server and a CIAO component that acts as a client. Similar statistics are printed. diff --git a/CIAO/performance-tests/Benchmark/server.cpp b/CIAO/performance-tests/Benchmark/server.cpp index 3091692da17..1ec50d59810 100644 --- a/CIAO/performance-tests/Benchmark/server.cpp +++ b/CIAO/performance-tests/Benchmark/server.cpp @@ -15,7 +15,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl index 83d68fc4353..1e486f79595 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl @@ -11,7 +11,7 @@ module ENW component TSEC_CheckPoint supports ISessionService { provides ISessionService sessionService; - + consumes ET_LifeToken lifeTokenIn; publishes ET_LifeToken lifeTokenOut; diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp b/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp index 0338143cdb9..07c6b9c8798 100644 --- a/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp +++ b/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp @@ -1,8 +1,8 @@ <!-- $Id$ --> <?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:deploymentPlan - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Modified_Deployment.xsd"> @@ -50,7 +50,7 @@ </value> </value> </configProperty> - + <deployedResource> <resourceUsage>InstanceUsesResource</resourceUsage> <requirementName>CIAO:PolicySet</requirementName> diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl index f62febba8a3..64f3458084c 100644 --- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl +++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl @@ -1,4 +1,4 @@ -//$Id$ +//$Id$ #ifndef ENW_IDL #define ENW_IDL @@ -19,7 +19,7 @@ module ENW eventtype ET_LifeToken { }; - + ////////////////////////////////////////////////////////////////////////////// // // ICheckPoint-Interfaces @@ -37,15 +37,15 @@ module ENW { TSession createSession(); boolean destroySession( in TSession Session ); - + TSession acquireSession( in long Ident ) raises( EUnknownIdent ); - + boolean releaseSession( in long Ident, in TSession Session ) raises( EUnknownSession ); }; - + }; diff --git a/CIAO/tests/Bug_3769_Regression/Foo.idl b/CIAO/tests/Bug_3769_Regression/Foo.idl index f10643810f1..5f4a3086922 100644 --- a/CIAO/tests/Bug_3769_Regression/Foo.idl +++ b/CIAO/tests/Bug_3769_Regression/Foo.idl @@ -47,7 +47,7 @@ enum DataType2 dtString, dtShortType }; -union Data2 switch (DataType2) +union Data2 switch (DataType2) { case dtString: string stringData; case dtShortType: short shortData; diff --git a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp index b30b126f5b2..abeb695c9ea 100644 --- a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp +++ b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp @@ -8,7 +8,7 @@ namespace CIAO_Foo_Impl //============================================================ // Component Executor Implementation Class: Foo_exec_i //============================================================ - + Foo_exec_i::Foo_exec_i (void) : my_short_ (false), my_long_ (false), @@ -25,22 +25,22 @@ namespace CIAO_Foo_Impl my_variable_string_ (false) { } - + Foo_exec_i::~Foo_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::CORBA::Short Foo_exec_i::my_short (void) { /* Your code here. */ return 0; } - + void Foo_exec_i::my_short ( ::CORBA::Short my_short) @@ -48,16 +48,16 @@ namespace CIAO_Foo_Impl if(my_short != 22) ACE_ERROR ((LM_ERROR, "ERROR: my_short != 22, it is %d\n", my_short)); else my_short_ = true; - + } - + ::CORBA::Long Foo_exec_i::my_long (void) { /* Your code here. */ return 0; } - + void Foo_exec_i::my_long ( ::CORBA::Long my_long) @@ -65,16 +65,16 @@ namespace CIAO_Foo_Impl if(my_long != 33) ACE_ERROR ((LM_ERROR, "ERROR: my_long != 33, it is %d\n", my_long)); else my_long_ = true; - + } - + ::CORBA::Float Foo_exec_i::my_float (void) { /* Your code here. */ return 0.0f; } - + void Foo_exec_i::my_float ( ::CORBA::Float my_float) @@ -82,16 +82,16 @@ namespace CIAO_Foo_Impl if(my_float != 45.67F) ACE_ERROR ((LM_ERROR, "ERROR: my_float != 45.67, it is %f\n", my_float)); else my_float_ = true; - + } - + ::CORBA::Double Foo_exec_i::my_double (void) { /* Your code here. */ return 0.0; } - + void Foo_exec_i::my_double ( ::CORBA::Double my_double) @@ -100,14 +100,14 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: my_double != 56.78, it is %f\n", my_double)); else my_double_ = true; } - + ::short_sequence * Foo_exec_i::my_short_sequence (void) { /* Your code here. */ return 0; } - + void Foo_exec_i::my_short_sequence ( const ::short_sequence & my_short_sequence) @@ -117,9 +117,9 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: my_short_sequence does not have the correct length\n")); return; } - + my_short_sequence_ = true; - + if(my_short_sequence[0] != 11) { my_short_sequence_ = false; @@ -138,14 +138,14 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: my_short_sequence[2] != 13, it is %d\n", my_short_sequence[2])); } } - + ::long_sequence * Foo_exec_i::my_long_sequence (void) { /* Your code here. */ return 0; } - + void Foo_exec_i::my_long_sequence ( const ::long_sequence & my_long_sequence) @@ -155,9 +155,9 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: my_long_sequence does not have the correct length\n")); return; } - + my_long_sequence_ = true; - + if(my_long_sequence[0] != 21) { ACE_ERROR ((LM_ERROR, "ERROR: my_long_sequence[0] != 21, it is %d\n", my_long_sequence[0])); @@ -176,14 +176,14 @@ namespace CIAO_Foo_Impl my_long_sequence_ = false; } } - + ::float_sequence * Foo_exec_i::my_float_sequence (void) { /* Your code here. */ return 0; } - + void Foo_exec_i::my_float_sequence ( const ::float_sequence & my_float_sequence) @@ -195,7 +195,7 @@ namespace CIAO_Foo_Impl } my_float_sequence_ = true; - + if(my_float_sequence[0] != 21.12F) { ACE_ERROR ((LM_ERROR, "ERROR: my_float_sequence[0] != 21.12, it is %f\n", my_float_sequence[0])); @@ -214,14 +214,14 @@ namespace CIAO_Foo_Impl my_float_sequence_ = false; } } - + ::double_sequence * Foo_exec_i::my_double_sequence (void) { /* Your code here. */ return 0; } - + void Foo_exec_i::my_double_sequence ( const ::double_sequence & my_double_sequence) @@ -231,15 +231,15 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: my_double_sequence does not have the correct length\n")); return; } - + this->my_double_sequence_ = true; - + if(my_double_sequence[0] != 621.12) { ACE_ERROR ((LM_ERROR, "ERROR: my_double_sequence[0] != 621.12, it is %f\n", my_double_sequence[0])); this->my_double_sequence_ = false; } - + if(my_double_sequence[1] != 622.22) { @@ -253,20 +253,20 @@ namespace CIAO_Foo_Impl this->my_double_sequence_ = false; } } - + ::Bar Foo_exec_i::my_bar_struct (void) { /* Your code here. */ return ::Bar (); } - + void Foo_exec_i::my_bar_struct ( const ::Bar & my_bar_struct) { my_bar_struct_ = true; - + if(my_bar_struct.s != 3) { my_bar_struct_ = false; @@ -298,7 +298,7 @@ namespace CIAO_Foo_Impl /* Your code here. */ return 0; } - + void Foo_exec_i::my_baz_struct ( const ::Baz & my_baz_struct) @@ -308,9 +308,9 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: my_bar_sequence is not 5\n")); return; } - + my_baz_struct_ = true; - + if (ACE_OS::strcmp (my_baz_struct.name.in (), "My Baz Struct") != 0) { @@ -318,12 +318,12 @@ namespace CIAO_Foo_Impl my_baz_struct.name.in ())); my_baz_struct_ = false; } - + CORBA::Short inc_s = 0; CORBA::Long inc_l = 0; CORBA::Float inc_f = 0; CORBA::Double inc_d = 0; - + for (CORBA::ULong i = 0; i < my_baz_struct.my_bar_sequence.length (); ++i) @@ -331,29 +331,29 @@ namespace CIAO_Foo_Impl if(my_baz_struct.my_bar_sequence[i].s != 3 + inc_s) { my_baz_struct_ = false; - ACE_ERROR ((LM_ERROR, "ERROR: short value != %d, it is %d\n", + ACE_ERROR ((LM_ERROR, "ERROR: short value != %d, it is %d\n", 3 + inc_s, my_baz_struct.my_bar_sequence[i].s)); } - + inc_s += 10; if(my_baz_struct.my_bar_sequence[i].l != 4 + inc_l) { my_baz_struct_ = false; - ACE_ERROR ((LM_ERROR, "ERROR: long value != %d, it is %d\n", + ACE_ERROR ((LM_ERROR, "ERROR: long value != %d, it is %d\n", 4 + inc_l, my_baz_struct.my_bar_sequence[i].l)); } - + inc_l += 10; if(my_baz_struct.my_bar_sequence[i].f != 5.6F + inc_f) { my_baz_struct_ = false; - ACE_ERROR ((LM_ERROR, "ERROR: float value != %f, it is %f\n", + ACE_ERROR ((LM_ERROR, "ERROR: float value != %f, it is %f\n", 5.6F + inc_f, my_baz_struct.my_bar_sequence[i].f)); } - + inc_f += 10.0F; if(my_baz_struct.my_bar_sequence[i].d != 7.8 + inc_d) @@ -363,7 +363,7 @@ namespace CIAO_Foo_Impl 7.8 + inc_d, my_baz_struct.my_bar_sequence[i].d)); } - + inc_d += 10.0; } } @@ -373,7 +373,7 @@ namespace CIAO_Foo_Impl Data d; return d; } - + void Foo_exec_i::my_data_union (const ::Data & /*my_data_union*/) @@ -393,7 +393,7 @@ namespace CIAO_Foo_Impl { return 0; } - + void Foo_exec_i::my_string_sequence ( const ::string_sequence & my_string_sequence) { @@ -402,9 +402,9 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: my_short_sequence does not have the correct length\n")); return; } - + my_string_sequence_ = true; - + if(ACE_OS::strcmp (my_string_sequence[0], "Hi") != 0) { my_string_sequence_ = false; @@ -484,25 +484,25 @@ namespace CIAO_Foo_Impl } // Operations from Components::SessionComponent. - + void Foo_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::CCM_Foo_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Foo_exec_i::configuration_complete (void) { } - + void Foo_exec_i::ccm_activate (void) { @@ -523,27 +523,27 @@ namespace CIAO_Foo_Impl ACE_ERROR ((LM_ERROR, "ERROR: Not all expected attributes were initialized\n")); } } - + void Foo_exec_i::ccm_passivate (void) { } - + void Foo_exec_i::ccm_remove (void) { } - + extern "C" FOO_EXEC_Export ::Components::EnterpriseComponent_ptr create_Foo_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Foo_exec_i); - + return retval; } } diff --git a/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp b/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp index b2caeaf06f7..0c09ea17812 100644 --- a/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp +++ b/CIAO/tests/Bug_3834_Regression/CompA_exec.cpp @@ -35,49 +35,49 @@ namespace CIAO_CompA_Impl //============================================================ // Facet Executor Implementation Class: Moo_exec_i //============================================================ - + Moo_exec_i::Moo_exec_i (void) { } - + Moo_exec_i::~Moo_exec_i (void) { } - + // Operations from ::Moo - + void Moo_exec_i::do_something (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "Moo_exec_i::do_something\n")); } - + //============================================================ // Component Executor Implementation Class: CompA_exec_i //============================================================ - + CompA_exec_i::CompA_exec_i (void) { } - + CompA_exec_i::~CompA_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::CCM_Moo_ptr CompA_exec_i::get_my_moo (void) { /* Your code here. */ return new Moo_exec_i; } - + // Operations from Components::SessionComponent. - + void CompA_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) @@ -86,51 +86,51 @@ namespace CIAO_CompA_Impl this->context_ = ::CCM_CompA_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void CompA_exec_i::configuration_complete (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "CompA_exec_i::configuration_complete\n")); } - + void CompA_exec_i::ccm_activate (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "CompA_exec_i::ccm_activate\n")); } - + void CompA_exec_i::ccm_passivate (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "CompA_exec_i::ccm_passivate\n")); } - + void CompA_exec_i::ccm_remove (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "CompA_exec_i::ccm_remove\n")); } - + extern "C" COMPA_EXEC_Export ::Components::EnterpriseComponent_ptr create_CompA_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, CompA_exec_i); - + return retval; } } diff --git a/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp b/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp index ab1604e1dcf..55f641c84ab 100644 --- a/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp +++ b/CIAO/tests/Bug_3834_Regression/CompB_exec.cpp @@ -35,21 +35,21 @@ namespace CIAO_CompB_Impl //============================================================ // Component Executor Implementation Class: CompB_exec_i //============================================================ - + CompB_exec_i::CompB_exec_i (void) { } - + CompB_exec_i::~CompB_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + // Operations from Components::SessionComponent. - + void CompB_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) @@ -58,20 +58,20 @@ namespace CIAO_CompB_Impl this->context_ = ::CCM_CompB_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void CompB_exec_i::configuration_complete (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "CompB_exec_i::configuration_complete\n")); } - + void CompB_exec_i::ccm_activate (void) { @@ -85,31 +85,31 @@ namespace CIAO_CompB_Impl moos[i].objref->do_something(); } } - + void CompB_exec_i::ccm_passivate (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "CompB_exec_i::ccm_passivate\n")); } - + void CompB_exec_i::ccm_remove (void) { /* Your code here. */ ACE_DEBUG ((LM_DEBUG, "CompB_exec_i::ccm_remove\n")); } - + extern "C" COMPB_EXEC_Export ::Components::EnterpriseComponent_ptr create_CompB_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, CompB_exec_i); - + return retval; } } diff --git a/CIAO/tests/DAnCE/Components/ProcessColocation.idl b/CIAO/tests/DAnCE/Components/ProcessColocation.idl index 6c38a2dd8f0..3651c57debc 100644 --- a/CIAO/tests/DAnCE/Components/ProcessColocation.idl +++ b/CIAO/tests/DAnCE/Components/ProcessColocation.idl @@ -8,7 +8,7 @@ module Simple { attribute string process_name; }; - + home ProcessColocationHome manages ProcessColocation { }; diff --git a/CIAO/tests/DAnCE/Components/Progressive.idl b/CIAO/tests/DAnCE/Components/Progressive.idl index b9edea73e02..0eb8f80bb39 100644 --- a/CIAO/tests/DAnCE/Components/Progressive.idl +++ b/CIAO/tests/DAnCE/Components/Progressive.idl @@ -13,7 +13,7 @@ module Simple uses Trigger trig_out; provides Trigger trig_in; }; - + home ProgressiveHome manages Progressive { }; diff --git a/CIAO/tests/DAnCE/Components/Progressive_exec.cpp b/CIAO/tests/DAnCE/Components/Progressive_exec.cpp index 80573c3f569..d8b91d9a163 100644 --- a/CIAO/tests/DAnCE/Components/Progressive_exec.cpp +++ b/CIAO/tests/DAnCE/Components/Progressive_exec.cpp @@ -62,16 +62,16 @@ namespace CIAO_Simple_Progressive_Impl ACE_DEBUG ((LM_EMERGENCY, "Trigger_exec_i::hello - " "Got the following information from trig port: %C\n", hello)); - + ::Simple::Trigger_var trig (this->context_->get_connection_trig_out ()); - + if (CORBA::is_nil (trig.in ())) { ACE_ERROR ((LM_ERROR, "SimpleUser_exec_i::ccm_activate () - " "Error: Reference nil for port trig\n")); return; } - + try { trig->hello ("Test successful; hello from SimpleUser."); @@ -92,20 +92,20 @@ namespace CIAO_Simple_Progressive_Impl //============================================================ // Component Executor Implementation Class: Progressive_exec_i //============================================================ - + Progressive_exec_i::Progressive_exec_i (void) : triggered_ (false) { } - + Progressive_exec_i::~Progressive_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + ::Simple::CCM_Trigger_ptr Progressive_exec_i::get_trig_in (void) { @@ -113,40 +113,40 @@ namespace CIAO_Simple_Progressive_Impl return new Trigger_exec_i (this->triggered_, this->context_); } - + // Operations from Components::SessionComponent. - + void Progressive_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::Simple::CCM_Progressive_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Progressive_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Progressive_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Progressive_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Progressive_exec_i::ccm_remove (void) { @@ -154,17 +154,17 @@ namespace CIAO_Simple_Progressive_Impl if (!triggered_) ACE_ERROR ((LM_EMERGENCY, "Error: My facet wasn't triggered!!\n")); } - + extern "C" PROGRESSIVE_EXEC_Export ::Components::EnterpriseComponent_ptr create_Simple_Progressive_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Progressive_exec_i); - + return retval; } } @@ -174,41 +174,41 @@ namespace CIAO_Simple_Progressive_Impl //============================================================ // Home Executor Implementation Class: ProgressiveHome_exec_i //============================================================ - + ProgressiveHome_exec_i::ProgressiveHome_exec_i (void) { } - + ProgressiveHome_exec_i::~ProgressiveHome_exec_i (void) { } - + // Implicit operations. - + ::Components::EnterpriseComponent_ptr ProgressiveHome_exec_i::create (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_THROW_EX ( retval, Progressive_exec_i, ::CORBA::NO_MEMORY ()); - + return retval; } - + extern "C" PROGRESSIVE_EXEC_Export ::Components::HomeExecutorBase_ptr create_Simple_ProgressiveHome_Impl (void) { ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); - + ACE_NEW_NORETURN ( retval, ProgressiveHome_exec_i); - + return retval; } } diff --git a/CIAO/tests/DAnCE/Components/SimpleAttribute.idl b/CIAO/tests/DAnCE/Components/SimpleAttribute.idl index 7d41978b4de..4d58fb0ae9a 100644 --- a/CIAO/tests/DAnCE/Components/SimpleAttribute.idl +++ b/CIAO/tests/DAnCE/Components/SimpleAttribute.idl @@ -13,7 +13,7 @@ module Simple attribute long long_attr; attribute short short_attr; }; - + home SimpleAttributeHome manages SimpleAttribute { attribute string str_attr; diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer.idl b/CIAO/tests/DAnCE/Components/SimpleConsumer.idl index 3895eacda3c..ef211d5a5ab 100644 --- a/CIAO/tests/DAnCE/Components/SimpleConsumer.idl +++ b/CIAO/tests/DAnCE/Components/SimpleConsumer.idl @@ -12,7 +12,7 @@ module Simple { consumes Hello hello_; }; - + home SimpleConsumerHome manages SimpleConsumer { }; diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp index 2e2ed924956..6b7f9bcfa45 100644 --- a/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp +++ b/CIAO/tests/DAnCE/Components/SimpleConsumer_exec.cpp @@ -32,7 +32,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl { CIAO_TRACE ("SimpleConsumer_exec_i::push_hello_ ()"); // Your code here. - + this->pushed_ = true; ACE_DEBUG ((LM_EMERGENCY, "SimpleConsumer_exec_i::push_hello_ - " "Received hello event, value is %s\n", ev->hello_ ())); diff --git a/CIAO/tests/DAnCE/Components/SimpleEmitter.idl b/CIAO/tests/DAnCE/Components/SimpleEmitter.idl index 9573547285d..bf4f3b3f6af 100644 --- a/CIAO/tests/DAnCE/Components/SimpleEmitter.idl +++ b/CIAO/tests/DAnCE/Components/SimpleEmitter.idl @@ -12,7 +12,7 @@ module Simple { emits Hello hello_; }; - + home SimpleEmitterHome manages SimpleEmitter { }; diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp index 42f847a5de5..8eaae13b30c 100644 --- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp +++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider_exec.cpp @@ -105,7 +105,7 @@ namespace CIAO_Simple_SimpleLocalProvider_Impl CIAO_TRACE ("SimpleLocalProvider_exec_i::ccm_remove ()"); if (!triggered_) ACE_ERROR ((LM_EMERGENCY, "Error: My facet wasn't triggered!!\n")); - + // Your code here. } diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl b/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl index ca8b86e0f8c..d0dcdccf4f8 100644 --- a/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl +++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser.idl @@ -12,7 +12,7 @@ module Simple { uses LocalTrigger trig; }; - + home SimpleLocalUserHome manages SimpleLocalUser { }; diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl index 60aec58f9af..586041187ff 100644 --- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl +++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.idl @@ -12,7 +12,7 @@ module Simple { uses multiple Trigger trig; }; - + home SimpleMultipleUserHome manages SimpleMultipleUser { }; diff --git a/CIAO/tests/DAnCE/Components/SimpleNull.idl b/CIAO/tests/DAnCE/Components/SimpleNull.idl index d8f02901be4..83782761858 100644 --- a/CIAO/tests/DAnCE/Components/SimpleNull.idl +++ b/CIAO/tests/DAnCE/Components/SimpleNull.idl @@ -7,7 +7,7 @@ module Simple component SimpleNull { }; - + home SimpleNullHome manages SimpleNull { }; diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp index 8b01d0a0be5..01dd4448756 100644 --- a/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp +++ b/CIAO/tests/DAnCE/Components/SimpleProvider_exec.cpp @@ -105,7 +105,7 @@ namespace CIAO_Simple_SimpleProvider_Impl CIAO_TRACE ("SimpleProvider_exec_i::ccm_remove ()"); if (!triggered_) ACE_ERROR ((LM_EMERGENCY, "Error: My facet wasn't triggered!!\n")); - + // Your code here. } diff --git a/CIAO/tests/DAnCE/Components/SimplePublisher.idl b/CIAO/tests/DAnCE/Components/SimplePublisher.idl index 555d41f9b8c..a4d6343be3b 100644 --- a/CIAO/tests/DAnCE/Components/SimplePublisher.idl +++ b/CIAO/tests/DAnCE/Components/SimplePublisher.idl @@ -12,7 +12,7 @@ module Simple { publishes Hello hello_; }; - + home SimplePublisherHome manages SimplePublisher { }; diff --git a/CIAO/tests/DAnCE/Components/SimpleUser.idl b/CIAO/tests/DAnCE/Components/SimpleUser.idl index 90d4e67e542..3bb1137dd8a 100644 --- a/CIAO/tests/DAnCE/Components/SimpleUser.idl +++ b/CIAO/tests/DAnCE/Components/SimpleUser.idl @@ -12,7 +12,7 @@ module Simple { uses Trigger trig; }; - + home SimpleUserHome manages SimpleUser { }; diff --git a/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt b/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt index 7c8fdf13f07..1f648916972 100644 --- a/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt +++ b/CIAO/tests/DAnCE/EM-Launch-Failures/README.txt @@ -1,7 +1,7 @@ - + This script tests redeployment of plans after initial launch failures. Each test uses 2 descriptors; the first with a configured launch failure - (at startup/configuration complete or at activate), the second for the + (at startup/configuration complete or at activate), the second for the same plan without the configured failure. After detecting the expected lauch failure of the first plan the test relaunches using the second plan and finishes by tearing it down. diff --git a/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt b/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt index 5d07968daa3..b755e62ce8d 100644 --- a/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt +++ b/CIAO/tests/DAnCE/EM-Shutdown-Failures/README.txt @@ -1,13 +1,13 @@ - + This script tests redeployment of plans after shutdown failures. - Each test uses 2 descriptors; the first with a configured shutdown failure - (at passivate or at remove), the second for the same plan without the + Each test uses 2 descriptors; the first with a configured shutdown failure + (at passivate or at remove), the second for the same plan without the configured failure. - After successfully launching the first plan and detecting the expected + After successfully launching the first plan and detecting the expected shutdown failure of the first plan at tear down the test repeats the cycle using the second plan. When tearing down the first plan the test uses the '-f' argument for the - plan launcher to force it to complete the tear down (tear down application - manager) even after catching errors from the first step (application tear + plan launcher to force it to complete the tear down (tear down application + manager) even after catching errors from the first step (application tear down).
\ No newline at end of file diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp index d4dd033bbce..4f2ef3b3395 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp index c1cf51d2b8f..35b9916d38e 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleMultipleUserComponentInstanceReverse"> <name>SimpleMultipleUserComponentReverse</name> <node>NodeTwo</node> @@ -222,7 +222,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp index 3e77fc3d48c..3b839da2323 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp @@ -225,7 +225,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleMultipleUserComponentInstanceReverse"> <name>SimpleMultipleUserComponentReverse</name> <node>NodeTwo</node> @@ -255,7 +255,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <!-- <internalEndpoint> @@ -269,7 +269,7 @@ <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> @@ -291,7 +291,7 @@ <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp index 9e74e7497b3..f145805483e 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp @@ -225,7 +225,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleMultipleUserComponentInstanceReverse"> <name>SimpleMultipleUserComponentReverse</name> <node>NodeTwo</node> @@ -255,7 +255,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <!-- <internalEndpoint> @@ -269,7 +269,7 @@ <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> @@ -291,7 +291,7 @@ <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp index 407b8dbefb8..5d500d5d76f 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp @@ -225,7 +225,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleMultipleUserComponentInstanceReverse"> <name>SimpleMultipleUserComponentReverse</name> <node>NodeTwo</node> @@ -255,7 +255,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <!-- <internalEndpoint> @@ -269,7 +269,7 @@ <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> @@ -291,7 +291,7 @@ <provider>false</provider> <kind>MultiplexReceptacle</kind> <instance xmi:idref="SimpleMultipleUserComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleProviderComponent</location> <provider>true</provider> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp index e9295c11a99..4fa193e0196 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation.cdp index e37e1fbc3cf..5126dc75efe 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation.cdp @@ -68,7 +68,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -114,12 +114,12 @@ <node/> <location>ProcessColocation_svnt</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> </localityConstraint> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp index b15570ef87e..8ea1bff926c 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp @@ -68,7 +68,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -88,7 +88,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -153,13 +153,13 @@ <node/> <location>ProcessColocation_svnt</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" /> </localityConstraint> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp index d3591fa3dbd..2ac6c2b6c31 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp @@ -68,7 +68,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -88,7 +88,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -108,7 +108,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -128,7 +128,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -193,13 +193,13 @@ <node/> <location>ProcessColocation_svnt</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" /> </localityConstraint> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp index dcf2ecb0340..cc9adc76a2c 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleUserComponentInstanceReverse"> <name>SimpleUserComponentReverse</name> <node>NodeTwo</node> @@ -222,7 +222,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp index b277aef2abc..47d78248fe8 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp @@ -225,7 +225,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleUserComponentInstanceReverse"> <name>SimpleUserComponentReverse</name> <node>NodeTwo</node> @@ -244,7 +244,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> @@ -252,7 +252,7 @@ <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleUserComponent</location> <provider>false</provider> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp index 3b14074d686..e1debbaf8a7 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp @@ -225,7 +225,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleUserComponentInstanceReverse"> <name>SimpleUserComponentReverse</name> <node>NodeTwo</node> @@ -244,7 +244,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> @@ -252,7 +252,7 @@ <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleUserComponent</location> <provider>false</provider> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp index 398ba171d46..89d99f7f087 100644 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp @@ -225,7 +225,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleUserComponentInstanceReverse"> <name>SimpleUserComponentReverse</name> <node>NodeTwo</node> @@ -244,7 +244,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> @@ -252,7 +252,7 @@ <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#SimpleUserComponent</location> <provider>false</provider> diff --git a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl index 281eec0a714..6e6cc4f4430 100755 --- a/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl +++ b/CIAO/tests/DAnCE/ExecutionManager-Deployments/run_test_cdr.pl @@ -208,14 +208,14 @@ foreach $file (@files) { "-x $file -o $cdr_plan"); $convert->Spawn (); - + if ($tg_convert_plan->WaitForFileTimed ($cdr_planbase, 30) == -1) { print STDERR "ERROR: Convert Plan failed to output $cdr_plan.\n"; kill_open_processes (); next; } - + $convert->Kill (); # Invoke executor - start the application -. @@ -229,7 +229,7 @@ foreach $file (@files) { "-k file://$ior_emfile -c $cdr_plan -s"); $E->SpawnWaitKill (120); print "Executor finished.\n"; - + $tg_convert_plan->DeleteFile ($cdr_planbase); delete_ior_files (); kill_open_processes (); diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Component.cdp b/CIAO/tests/DAnCE/Executor-Destructor/Component.cdp index 29e739ad5af..2672c684d1d 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Component.cdp +++ b/CIAO/tests/DAnCE/Executor-Destructor/Component.cdp @@ -10,7 +10,7 @@ <!-- Implementations declarations --> <!-- Home implementation --> - + <implementation xmi:id="CompSvrImpl"> <name>CompSvr</name> <source /> @@ -27,7 +27,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="Executor_DestructorComponentImplementation"> <name>Executor_DestructorComponentImplementation</name> <source/> @@ -149,7 +149,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="CompSvrInst"> <name>ComponentServerInstance</name> <node>Executor_DestructorNode</node> @@ -267,7 +267,7 @@ <node/> <location>Executor_Destructor_stub</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="CompSvrInst" /> diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp index c725a82710b..0dd6f6ef11f 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp +++ b/CIAO/tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp @@ -13,15 +13,15 @@ namespace dance_test Exec_Dest_Status::Exec_Dest_Status (void) : instances_ () { - + } - + Exec_Dest_Status::~Exec_Dest_Status (void) { - + } - void + void Exec_Dest_Status::plan (const ::Deployment::DeploymentPlan *plan) { if (plan == 0) @@ -29,22 +29,22 @@ namespace dance_test ACE_ERROR ((LM_ERROR, "Error: Nil plan passed to exec_dest_status\n")); return; } - + for (CORBA::ULong i = 0; i < plan->instance.length (); ++i) { this->instances_[plan->instance[i].name.in ()] = Instance_Status (); } } - - void + + void Exec_Dest_Status::destructor_called (const std::string &id) { ACE_DEBUG ((LM_TRACE, "Got destructor invocation for id <%C>\n", id.c_str ())); - this->instances_[id].destructor_ = true; + this->instances_[id].destructor_ = true; } - - bool + + bool Exec_Dest_Status::check_destructor (const std::string &id) { return this->instances_[id].destructor_; diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl index cd2d58ad8d6..4dbffd6787c 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl +++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.idl @@ -8,7 +8,7 @@ module dance_test { attribute string id; }; - + home Home_Destructor manages Exec_Destructor { attribute string id; diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp index 5e8eb39d8f7..7628b9abeac 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp +++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp @@ -23,12 +23,12 @@ namespace DAnCE { if (!dance_test::EXEC_DEST_STATUS::instance ()->check_destructor (*i)) { - ACE_ERROR ((LM_EMERGENCY, + ACE_ERROR ((LM_EMERGENCY, ACE_TEXT ("Error: Destructor for instance <%C> not invoked\n"), i->c_str ())); } - else - { + else + { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Success! Destructor for instance <%C> was invoked!\n"), i->c_str ())); @@ -47,9 +47,9 @@ namespace DAnCE { for (CORBA::ULong i = 0; i < plan.instance.length (); ++i) { - ::Deployment::MonolithicDeploymentDescription &mdd = + ::Deployment::MonolithicDeploymentDescription &mdd = plan.implementation[plan.instance[i].implementationRef]; - + if (ACE_OS::strcmp (DAnCE::Utility::get_instance_type (mdd.execParameter), ::DAnCE::DANCE_LOCALITYMANAGER) != 0) this->instance_ids_.insert (plan.instance[i].name.in ()); diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp index afc74d4c184..06cb82dc7da 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp +++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor_exec.cpp @@ -37,75 +37,75 @@ namespace CIAO_dance_test_Exec_Destructor_Impl //============================================================ // Component Executor Implementation Class: Exec_Destructor_exec_i //============================================================ - + Exec_Destructor_exec_i::Exec_Destructor_exec_i (void) { } - + Exec_Destructor_exec_i::~Exec_Destructor_exec_i (void) { ACE_DEBUG ((LM_DEBUG, "Exec_Destructor_exec_i::~Exec_Destructor_exec_i\n")); dance_test::EXEC_DEST_STATUS::instance ()->destructor_called (this->name_); } - + // Supported operations and attributes. - + // Component attributes and port operations. - + // Operations from Components::SessionComponent. - + void Exec_Destructor_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->ciao_context_ = ::dance_test::CCM_Exec_Destructor_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Exec_Destructor_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Exec_Destructor_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Exec_Destructor_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Exec_Destructor_exec_i::ccm_remove (void) { } - - void + + void Exec_Destructor_exec_i::id (const char *name) { this->name_ = name; } - + extern "C" EXECUTOR_DESTRUCTOR_EXEC_Export ::Components::EnterpriseComponent_ptr create_dance_test_Exec_Destructor_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Exec_Destructor_exec_i); - + return retval; } } @@ -115,55 +115,55 @@ namespace CIAO_dance_test_Exec_Destructor_Impl //============================================================ // Home Executor Implementation Class: Home_Destructor_exec_i //============================================================ - + Home_Destructor_exec_i::Home_Destructor_exec_i (void) { } - + Home_Destructor_exec_i::~Home_Destructor_exec_i (void) { ACE_DEBUG ((LM_DEBUG, "Home_Destructor_exec_i::~Home_Destructor_exec_i\n")); dance_test::EXEC_DEST_STATUS::instance ()->destructor_called (this->name_); } - + // Implicit operations. - + ::Components::EnterpriseComponent_ptr Home_Destructor_exec_i::create (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_THROW_EX ( retval, Exec_Destructor_exec_i, ::CORBA::NO_MEMORY ()); - + return retval; } - - void + + void Home_Destructor_exec_i::id (const char *name) { this->name_ = name; } - char * + char * Home_Destructor_exec_i::id (void) { return 0; } - + extern "C" EXECUTOR_DESTRUCTOR_EXEC_Export ::Components::HomeExecutorBase_ptr create_dance_test_Home_Destructor_Impl (void) { ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); - + ACE_NEW_NORETURN ( retval, Home_Destructor_exec_i); - + return retval; } } diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp index f45f9778818..3603930605c 100644 --- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp +++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity_exec.cpp @@ -63,7 +63,7 @@ namespace CIAO_cpuaffinity_A_Impl { #if defined (LINUX_VERSION_CODE) && defined (KERNEL_VERSION) # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,8)) - + if (ACE_OS::num_processors () < 2) { ACE_DEBUG ((LM_DEBUG, "This machine only has a single processor, aborting\n")); @@ -74,13 +74,13 @@ namespace CIAO_cpuaffinity_A_Impl CPU_ZERO (&mask); int retval = sched_getaffinity (0, sizeof (cpu_set_t), &mask); - + if (retval != 0) { ACE_ERROR ((LM_ERROR, "Error: Non-zero return value from sched_getaffinity %p\n")); return; } - + int z_set = CPU_ISSET (0, &mask); int o_set = CPU_ISSET (1, &mask); @@ -90,13 +90,13 @@ namespace CIAO_cpuaffinity_A_Impl ACE_ERROR ((LM_ERROR, "Error: Expected to only be on processor zero.\n")); return; } - + if (cpu_affinity_ == 1 && (z_set || !o_set)) { ACE_ERROR ((LM_ERROR, "Error: Expected to only be on processor one.\n")); } - + if (cpu_affinity_ > 1) { ACE_ERROR ((LM_ERROR, "Error: Trying to test an affinity I don't support\n")); diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/Component.cdp b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/Component.cdp index fb22f2f6a70..0d01585c052 100644 --- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/Component.cdp +++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/Component.cdp @@ -10,7 +10,7 @@ <!-- Implementations declarations --> <!-- Home implementation --> - + <implementation xmi:id="CompSvrImpl"> <name>CompSvr</name> <source /> @@ -27,7 +27,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="CPUAffinityImplementation"> <name>CPUAffinityImplementation</name> <source/> @@ -79,7 +79,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="CompSvrInst"> <name>ComponentServerInstance</name> <node>CPUAffinityNode</node> @@ -183,7 +183,7 @@ <node/> <location>CPUAffinity_stub</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="CompSvrInst" /> diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component.cdp b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component.cdp index a958c84f3e0..21a8735565b 100644 --- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component.cdp +++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component.cdp @@ -10,7 +10,7 @@ <!-- Implementations declarations --> <!-- Home implementation --> - + <implementation xmi:id="CompSvrImpl"> <name>CompSvr</name> <source /> @@ -27,7 +27,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="CommandlinePassageComponentImplementation"> <name>CommandlinePassageComponentImplementation</name> <source/> @@ -79,7 +79,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="CompSvrInst"> <name>ComponentServerInstance</name> <node>CommandlinePassageNode</node> @@ -144,7 +144,7 @@ <node/> <location>CommandlinePassage_stub</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="CompSvrInst" /> diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/Component.cdp b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/Component.cdp index 05232b361a2..212dad86f96 100644 --- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/Component.cdp +++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/Component.cdp @@ -10,7 +10,7 @@ <!-- Implementations declarations --> <!-- Home implementation --> - + <implementation xmi:id="CompSvrImpl"> <name>CompSvr</name> <source /> @@ -27,7 +27,7 @@ </value> </execParameter> </implementation> - + <implementation xmi:id="UnexpectedShutdownImplementation"> <name>UnexpectedShutdownImplementation</name> <source/> @@ -79,7 +79,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="CompSvrInst"> <name>ComponentServerInstance</name> <node>UnexpectedShutdownNode</node> @@ -153,7 +153,7 @@ <node/> <location>UnexpectedShutdown_stub</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="CompSvrInst" /> diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp index cb334153654..b3936e33821 100644 --- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp +++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown_exec.cpp @@ -35,52 +35,52 @@ namespace CIAO_locality_Shutdown_Impl //============================================================ // Component Executor Implementation Class: Shutdown_exec_i //============================================================ - + Shutdown_exec_i::Shutdown_exec_i (void) { } - + Shutdown_exec_i::~Shutdown_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + // Operations from Components::SessionComponent. - + void Shutdown_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->ciao_context_ = ::locality::CCM_Shutdown_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Shutdown_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Shutdown_exec_i::ccm_activate (void) { - ::DAnCE::LocalityManager_var lm = + ::DAnCE::LocalityManager_var lm = this->ciao_context_->get_connection_lm_port (); - + if (CORBA::is_nil (lm.in ())) { ACE_ERROR ((LM_ERROR, "Error: lm_port has a nil reference\n")); return; } - + try { lm->shutdown (); @@ -91,29 +91,29 @@ namespace CIAO_locality_Shutdown_Impl ex._info ().c_str ())); } } - + void Shutdown_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Shutdown_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" COMMANDLINEPASSAGE_EXEC_Export ::Components::EnterpriseComponent_ptr create_locality_Shutdown_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Shutdown_exec_i); - + return retval; } } diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp index 09dfc259600..823e86a9993 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/EmitsConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/LocalSimplexConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/LocalSimplexConnectionExplicitHome.cdp index ed7075beb68..90bb678edd6 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/LocalSimplexConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/LocalSimplexConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleLocalUserComponentInstanceReverse"> <name>SimpleLocalUserComponentReverse</name> <node>Node</node> @@ -222,7 +222,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <deployRequirement> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp index c67354705c0..ac82795eb37 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleMultipleUserComponentInstanceReverse"> <name>SimpleMultipleUserComponentReverse</name> <node>Node</node> @@ -222,7 +222,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp index b778be0c3b0..784a675ba07 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation.cdp index 6cf077a6a16..4e702f72c68 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation.cdp @@ -68,7 +68,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -114,12 +114,12 @@ <node/> <location>ProcessColocation_svnt</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> </localityConstraint> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_2.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_2.cdp index df2382eceb9..0ba1377a4f6 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_2.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_2.cdp @@ -68,7 +68,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -88,7 +88,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -153,13 +153,13 @@ <node/> <location>ProcessColocation_svnt</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" /> </localityConstraint> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_Default.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_Default.cdp index 831979df996..82caa29e283 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_Default.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/SimpleProcessColocation_Default.cdp @@ -68,7 +68,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -88,7 +88,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -108,7 +108,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -128,7 +128,7 @@ <!-- hostname --> <source/> <implementation xmi:idref="ProcessColocationComponentImplementation" /> - + <configProperty> <name>process_name</name> <value> @@ -193,13 +193,13 @@ <node/> <location>ProcessColocation_svnt</location> </artifact> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" /> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" /> </localityConstraint> - + <localityConstraint> <constraint>SameProcess</constraint> <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" /> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp index c66899cd8c0..09258e030cb 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/SimplexConnectionExplicitHome.cdp @@ -203,7 +203,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleUserComponentInstanceReverse"> <name>SimpleUserComponentReverse</name> <node>Node</node> @@ -222,7 +222,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/TwoComponentsOneHome.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/TwoComponentsOneHome.cdp index b334977462f..0d118133609 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/TwoComponentsOneHome.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/TwoComponentsOneHome.cdp @@ -222,7 +222,7 @@ </value> </configProperty> </instance> - + <instance xmi:id="SimpleUserComponentInstanceReverse"> <name>SimpleUserComponentReverse</name> <node>Node</node> @@ -241,7 +241,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl b/CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl index d70cc75773a..ee40ebc5fac 100755 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/run_test_cdr.pl @@ -200,7 +200,7 @@ foreach $file (@files) { kill_open_processes (); next; } - + $convert->Kill (); # Invoke executor - start the application -. @@ -208,13 +208,13 @@ foreach $file (@files) { $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-c $file.cdr -n file://NodeApp1.ior -l -oNode"); $E->SpawnWaitKill (120); - + print "Teardown the application\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-n file://NodeApp1.ior -a file://Node_APP.ior -m file://Node_AM.ior -s"); $E->SpawnWaitKill (120); print "Executor finished.\n"; - + $tg_convert_plan->DeleteFile ($cdr_planbase); delete_ior_files (); diff --git a/CIAO/tests/DAnCE/Progressive_Deployments/Plan_A.cdp b/CIAO/tests/DAnCE/Progressive_Deployments/Plan_A.cdp index 7c1469fc2bb..c10fc193098 100644 --- a/CIAO/tests/DAnCE/Progressive_Deployments/Plan_A.cdp +++ b/CIAO/tests/DAnCE/Progressive_Deployments/Plan_A.cdp @@ -115,7 +115,7 @@ </value> </configProperty> </instance> - + <artifact xmi:id="Progressive_ExecArtifact"> <name>Progressive_exec</name> <source/> diff --git a/CIAO/tests/DAnCE/Progressive_Deployments/Plan_B.cdp b/CIAO/tests/DAnCE/Progressive_Deployments/Plan_B.cdp index 6899fa8adb9..14c87615a62 100644 --- a/CIAO/tests/DAnCE/Progressive_Deployments/Plan_B.cdp +++ b/CIAO/tests/DAnCE/Progressive_Deployments/Plan_B.cdp @@ -123,7 +123,7 @@ <provider>false</provider> <kind>SimplexReceptacle</kind> <instance xmi:idref="ProgressiveComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#Progressive_A</location> <provider>true</provider> diff --git a/CIAO/tests/DAnCE/Progressive_Deployments/Plan_C.cdp b/CIAO/tests/DAnCE/Progressive_Deployments/Plan_C.cdp index a64c1f627b9..471985cadeb 100644 --- a/CIAO/tests/DAnCE/Progressive_Deployments/Plan_C.cdp +++ b/CIAO/tests/DAnCE/Progressive_Deployments/Plan_C.cdp @@ -225,7 +225,7 @@ </value> </configProperty> </instance> - + <connection> <name>TestConnection</name> <internalEndpoint> @@ -233,7 +233,7 @@ <provider>true</provider> <kind>Facet</kind> <instance xmi:idref="SimpleProviderComponentInstance" /> - </internalEndpoint> + </internalEndpoint> <externalReference> <location>corbaname:rir:/NameService#Progressive_A</location> <provider>false</provider> diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl index 15c32fe82b3..e65b1ea7794 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl +++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl @@ -13,37 +13,37 @@ module Attributes attribute float test; attribute long testA, testB; }; - + component Bar { readonly attribute float test1; readonly attribute long testB, testC; }; - + exception FooException { }; - + exception BarException { }; - + component FooRaises { attribute float test2 getraises (FooException); }; - + component BarRaises { attribute float test3 setraises (BarException); }; - + component FooBarRaises { - attribute float test4 + attribute float test4 getraises (FooException) setraises (BarException); }; - + component ROFooRaises { readonly attribute float test5 raises (FooException); diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl index e07fa13a7d2..0d6f578cef0 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl +++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl @@ -11,19 +11,19 @@ module EventSink eventtype foo_event { }; - + eventtype bar_event { }; - + component Foo { consumes foo_event c_foo; }; - + component Bar : Foo { consumes bar_event c_bar; }; - + }; diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl index f5614d964e5..761c5c3a5b0 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl +++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl @@ -11,12 +11,12 @@ module PublishesEmits eventtype foo_event { }; - + component Foo { publishes foo_event p_foo; }; - + component Bar { emits foo_event foo; diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl index eedabcf3184..f2c5a1417b5 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl +++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl @@ -10,19 +10,19 @@ module Facets { - interface foo_interface + interface foo_interface { }; - + interface bar_interface { }; - + component Foo { provides foo_interface p_foo; }; - + component Bar : Foo { provides bar_interface p_bar; diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl index bd0af99cd86..2e0db26d6a4 100644 --- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl +++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl @@ -13,7 +13,7 @@ module ReceptaclesSingle interface foo_interface { }; - + interface bar_interface { }; @@ -22,23 +22,23 @@ module ReceptaclesSingle { uses foo_interface u_foo; }; - + component Bar : Foo { uses bar_interface u_bar; }; - + component FooBar { uses foo_interface foo; uses bar_interface bar; }; - + component ObjectFoo { uses Object foo; }; - + }; module ReceptaclesMultiple @@ -46,21 +46,21 @@ module ReceptaclesMultiple interface foo_interface { }; - + interface bar_interface { }; - + component Foo { uses multiple foo_interface um_foo; }; - + component Bar { uses multiple bar_interface um_bar; }; - + component ObjectFoo { uses multiple Object foo; diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract.idl b/CIAO/tests/IDL3/Events/Abstract/Abstract.idl index 15eb50971b3..9d07f285c90 100644 --- a/CIAO/tests/IDL3/Events/Abstract/Abstract.idl +++ b/CIAO/tests/IDL3/Events/Abstract/Abstract.idl @@ -17,21 +17,21 @@ module AbstractEvents abstract eventtype InhFoo_event : foo_event { }; - + abstract eventtype bar_event { }; - + abstract eventtype foobar_event : foo_event, bar_event { }; // test event multiple inheretance - + eventtype concrete_foo { }; - + eventtype concrete_foobar : concrete_foo, foo_event { }; diff --git a/CIAO/tests/IDL3/Events/Regular/Regular.idl b/CIAO/tests/IDL3/Events/Regular/Regular.idl index f9169026e88..c244ea4af3e 100644 --- a/CIAO/tests/IDL3/Events/Regular/Regular.idl +++ b/CIAO/tests/IDL3/Events/Regular/Regular.idl @@ -13,21 +13,21 @@ module RegularEvents eventtype foo { }; - + eventtype bar { }; - + eventtype InhFoo : foo { }; - /* @@ - * TAO_IDL cannot handle custom yet. + /* @@ + * TAO_IDL cannot handle custom yet. custom eventtype custom_foo { }; - + custom eventtype custom_InhFoo : foo { }; @@ -39,6 +39,6 @@ module RegularEvents void test_op_a (in long foo, out float bar); InhFoo test_op_b (); }; - - + + }; diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl index 7dd338d871e..245a0eb449c 100644 --- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl +++ b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl @@ -10,45 +10,45 @@ module HomeAttributes { - interface foo_interface + interface foo_interface { }; - - component Foo supports foo_interface + + component Foo supports foo_interface { }; - + home FooHome manages Foo { attribute float test; attribute long testA, testB; }; - + exception FooException { }; - + exception BarException { }; - + home ROFooHome manages Foo { readonly attribute float test1; readonly attribute long testB, testC; }; - + home FooRaisesHome manages Foo { attribute float test2 getraises (FooException); attribute float test3 setraises (BarException); - attribute float test4 + attribute float test4 getraises (FooException) setraises (BarException); }; - + home ROFooRaisesHome manages Foo { readonly attribute float test5 raises (FooException); }; - + }; diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic.idl b/CIAO/tests/IDL3/Homes/Basic/Basic.idl index 3d9f4c5162e..47705a7bdb2 100644 --- a/CIAO/tests/IDL3/Homes/Basic/Basic.idl +++ b/CIAO/tests/IDL3/Homes/Basic/Basic.idl @@ -10,22 +10,22 @@ module BasicHomes { - + interface foo_interface {}; - + component Foo supports foo_interface {}; - + home FooHome manages Foo { }; - - + + interface bar_interface {}; - + component Bar supports bar_interface {}; - + home BarHome supports foo_interface manages Bar { }; - + }; diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory.idl b/CIAO/tests/IDL3/Homes/Factory/Factory.idl index c9520b11c0a..64646d93515 100644 --- a/CIAO/tests/IDL3/Homes/Factory/Factory.idl +++ b/CIAO/tests/IDL3/Homes/Factory/Factory.idl @@ -13,23 +13,23 @@ module FactoryHomes exception foo_exception { }; - - interface foo_interface + + interface foo_interface { }; - - component Foo supports foo_interface + + component Foo supports foo_interface { }; - + home FooHome manages Foo { factory FooFactory (in string foo, in short bar) raises (foo_exception); }; - + eventtype food { }; - + }; diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder.idl b/CIAO/tests/IDL3/Homes/Finder/Finder.idl index 5057b162fc3..ce5abc74804 100644 --- a/CIAO/tests/IDL3/Homes/Finder/Finder.idl +++ b/CIAO/tests/IDL3/Homes/Finder/Finder.idl @@ -13,18 +13,18 @@ module FactoryHomes exception foo_exception { }; - - interface foo_interface + + interface foo_interface { }; - - component Foo supports foo_interface + + component Foo supports foo_interface { }; - + home FooHome manages Foo { factory FooFinder (in string foo, in short bar) raises (foo_exception); }; - + }; diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl index e1bce50fc2f..dca1c828c20 100644 --- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl +++ b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl @@ -2,7 +2,7 @@ /** * @file Inheritance.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests the compilation of Home inheritance. */ @@ -10,24 +10,24 @@ module HomeInheritance { - interface foo_interface + interface foo_interface { }; - + component Foo supports foo_interface { }; - + home FooHome manages Foo { }; - + component Bar { }; - + home BarHome : FooHome manages Bar { }; - + }; diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/include.idl b/CIAO/tests/IDL3/ImpliedIDL/All/include.idl index 848d4128b6e..b6c197d6453 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/All/include.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/All/include.idl @@ -6,7 +6,7 @@ * Tests tool's regeneration of IDL2 constructs, which * should be basically unchanged. */ - + #ifndef INCLUDE_IDL #define INCLUDE_IDL @@ -20,7 +20,7 @@ module pre_mod string reasons[4][2]; wstring<3> why; }; - + enum which { ZERO, diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl b/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl index 987077bc185..acbcb32f9ef 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/All/keyword_clash.idl @@ -30,7 +30,7 @@ module static interface virtual { }; - + eventtype _eventtype { private virtual _public; @@ -53,23 +53,23 @@ module _component provides _interface::_attribute _local; provides _oneway else; provides static::_readonly::protected::virtual while; - + attribute long _abstract; - + uses multiple _interface::_attribute if; uses multiple _oneway mutable; uses multiple static::_readonly::protected::virtual register; - + uses _interface::_attribute _union; uses _oneway _struct; uses static::_readonly::protected::virtual volatile; - + publishes _eventtype _object; publishes static::_readonly::protected::_eventtype do; - + consumes _eventtype _const; consumes static::_readonly::protected::_eventtype const_cast; - + emits _eventtype class; emits static::_readonly::protected::_eventtype delete; }; @@ -80,7 +80,7 @@ module _component catch ( inout static::_readonly::protected::_eventtype try) raises (_interface::_attribute::_inout); - + finder continue (in _interface::_attribute _inout); }; }; diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl b/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl index b3aed65f2df..eda192a6138 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/All/raw_include.idl @@ -8,7 +8,7 @@ * an IDL2 file corresponding to the IDL3 file this one is * included in unchanged, without the '_IDL2' suffix. */ - + #ifndef RAW_INCLUDE_IDL #define RAW_INCLUDE_IDL diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl index 7bf8f83c98c..4c2b798dfa8 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl @@ -13,7 +13,7 @@ module ImpliedEventSink eventtype foo_event { }; - + component Foo { consumes foo_event c_foo; diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl index 578efbed7e4..25abe6983ff 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl @@ -13,21 +13,21 @@ module ImpliedSources eventtype foo_event { }; - + eventtype bar_event { }; - + component Foo { publishes foo_event p_foo; }; - + component Bar { emits bar_event e_bar; }; - /* + /* interface test { ImpliedSources::FooEventConsumers::foo_eventConsumer test_op (); diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl index 7af66e50e8c..56681c3a5cb 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl @@ -2,7 +2,7 @@ /** * @file ICReceptacles.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests equivalent idl for receptacles. */ #include <Components.idl> @@ -12,12 +12,12 @@ module EquivReceptacles interface foo_interface { }; - - component Foo + + component Foo { uses multiple foo_interface foo_recep; }; - + /** interface bar { diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl index 62092c9e958..c7940d821e8 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl @@ -2,7 +2,7 @@ /** * @file Events.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests implied IDL for event types. */ diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl index 3440458b4b2..8c781e8fea4 100644 --- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl +++ b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl @@ -2,7 +2,7 @@ /** * @file Homes.idl * @author Will Otte <wotte@dre.vanderbilt.edu> - * + * * Tests equivalent IDL semantics for Homes */ @@ -13,7 +13,7 @@ module ImplicitHomes component Foo { }; - + home FooHome manages Foo { }; diff --git a/CIAO/tests/IDL3/Lookup/lookup_test.idl b/CIAO/tests/IDL3/Lookup/lookup_test.idl index 74d9b85de22..4850ab2e743 100644 --- a/CIAO/tests/IDL3/Lookup/lookup_test.idl +++ b/CIAO/tests/IDL3/Lookup/lookup_test.idl @@ -3,7 +3,7 @@ * @file lookup_test.idl * @authors Boris Kolpackov <boris@dre.vanderbilt.edu> * Jeff Parsons <j.parsons@vanderbilt.edu> - * + * * Tests IDL compiler lookup when local names are used * to reference declarations in supported interfaces, * base valuetypes, base components, and base homes. @@ -27,46 +27,46 @@ module M { void f (in Foo bar) raises (Ex); }; - + valuetype VB { typedef long Bar; }; - + valuetype V : VB supports IB { void f (in Bar foo) raises (Ex); }; - + valuetype EB { typedef long Bar; }; - + valuetype E : EB supports IB { void f (in Bar foo) raises (Ex); }; - + interface T { typedef long Bar; }; - + component CB supports T { }; - + component C : CB { attribute Bar baz; }; - + home HB supports IB manages CB { typedef long Bar; }; - + home H : HB manages C { void f (in Bar b) raises (Ex); diff --git a/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl b/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl index 2ea500c8ce7..5af6d98f9e0 100755 --- a/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl +++ b/CIAO/tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl @@ -45,7 +45,7 @@ $B_line = ""; $B_ns = "two"; @data = (); -# search for right tag in generated xmi +# search for right tag in generated xmi open (DAT, $xmi) || die ("ERROR: Could not open file <$xmi>!"); while ($line = <DAT>) { push @data, $line; diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl index be2751bacfb..b38255bd22b 100644 --- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl +++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl @@ -198,7 +198,7 @@ module HomeMod #if !defined (CCM_LW) finder kitchen_sink (in string uid, in pkey key, in boolean all) raises (ch_except); -#endif +#endif }; }; diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC.cdp b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC.cdp index 3f208ebb952..9ad9983f7db 100644 --- a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC.cdp +++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC.cdp @@ -61,7 +61,7 @@ </value> </execParameter> </implementation> - + <instance xmi:id="ComponentCComponentInstance"> <name>ComponentCComponent</name> <node>ComponentCNode</node> diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl index 613a7ec6adb..b103eb71601 100644 --- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl +++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl @@ -25,7 +25,7 @@ module connector_test attribute string Z_a; void opZ (); }; - + component A { attribute string topic_name_a; diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl b/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl index 8c47f660041..ea5fc037cc3 100755 --- a/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl +++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl @@ -101,7 +101,7 @@ sub kill_open_processes { if ($ns_running == 1) { $NS->Kill (); $NS->TimedWait (1); } - + # in case the planlauncher wasn't able to shut everything down as supposed $tg_executor->KillAll ('dance_locality_manager'); } diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl index 9ba7d3152be..d7f196b413a 100644 --- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl +++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl @@ -66,7 +66,7 @@ module A module Nested<typename T, sequence <T> TSeq> { typedef short y; - + abstract interface abs_XX { }; @@ -74,7 +74,7 @@ module A interface XX { }; - + // To make sure the overrides of _is_nil() and // release() that we need for mixed parentage // interfaces get generated when the template @@ -122,7 +122,7 @@ module second<exception X, typename W> { public long id_key; }; -#endif +#endif }; module B @@ -140,7 +140,7 @@ module B module T { typedef unsigned long MyLongType; - + module Typed <typename T, sequence <T> TSeq> { local interface X @@ -160,7 +160,7 @@ module T port Y my_port; port Y my_second_port; }; - + connector C { port Y my_m_port; @@ -217,12 +217,12 @@ module I module Nested_I<typename T, sequence <T> TSeq> { alias A::Nested<T, TSeq> NestedA; - + interface B { void send (in T arg); }; - + connector Y { provides B myport; @@ -274,7 +274,7 @@ module Ast<typename T, component Comp_T { uses multiple T Comp_T_Recep; - + mirrorport PT_T Comp_T_Mirror_Port; provides T Comp_T_Facet; emits E Comp_T_Emit; diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp index 8a866682786..831e667345a 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp +++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp @@ -36,68 +36,68 @@ namespace CIAO_Minimum_Receiver_Impl //============================================================ // Component Executor Implementation Class: Receiver_exec_i //============================================================ - + Receiver_exec_i::Receiver_exec_i (void) { } - + Receiver_exec_i::~Receiver_exec_i (void) { } - + // Supported operations and attributes. - + // Component attributes and port operations. - + // Operations from Components::SessionComponent. - + void Receiver_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::Minimum::CCM_Receiver_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Receiver_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Receiver_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Receiver_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Receiver_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Minimum_Receiver_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Receiver_exec_i); - + return retval; } } @@ -107,47 +107,47 @@ namespace CIAO_Minimum_Receiver_Impl //============================================================ // Home Executor Implementation Class: ReceiverHome_exec_i //============================================================ - + ReceiverHome_exec_i::ReceiverHome_exec_i (void) { } - + ReceiverHome_exec_i::~ReceiverHome_exec_i (void) { } - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + ::Components::EnterpriseComponent_ptr ReceiverHome_exec_i::create (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_THROW_EX ( retval, Receiver_exec_i, ::CORBA::NO_MEMORY ()); - + return retval; } - + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Minimum_ReceiverHome_Impl (void) { ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); - + ACE_NEW_NORETURN ( retval, ReceiverHome_exec_i); - + return retval; } } diff --git a/CIAO/tests/Minimum/Sender/Sender.idl b/CIAO/tests/Minimum/Sender/Sender.idl index 74b9bf76f9a..dc1548f5394 100644 --- a/CIAO/tests/Minimum/Sender/Sender.idl +++ b/CIAO/tests/Minimum/Sender/Sender.idl @@ -11,7 +11,7 @@ module Minimum /* This is a Sender specific interface which will be used to get the * process start. */ - + interface trigger { void bar (); diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.cpp b/CIAO/tests/Minimum/Sender/Sender_exec.cpp index bb502184403..688a3c34f2a 100644 --- a/CIAO/tests/Minimum/Sender/Sender_exec.cpp +++ b/CIAO/tests/Minimum/Sender/Sender_exec.cpp @@ -36,74 +36,74 @@ namespace CIAO_Minimum_Sender_Impl //============================================================ // Component Executor Implementation Class: Sender_exec_i //============================================================ - + Sender_exec_i::Sender_exec_i (void) { } - + Sender_exec_i::~Sender_exec_i (void) { } - + // Supported operations and attributes. - + void Sender_exec_i::bar (void) { /* Your code here. */ } - + // Component attributes and port operations. - + // Operations from Components::SessionComponent. - + void Sender_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { this->context_ = ::Minimum::CCM_Sender_Context::_narrow (ctx); - + if ( ::CORBA::is_nil (this->context_.in ())) { throw ::CORBA::INTERNAL (); } } - + void Sender_exec_i::configuration_complete (void) { /* Your code here. */ } - + void Sender_exec_i::ccm_activate (void) { /* Your code here. */ } - + void Sender_exec_i::ccm_passivate (void) { /* Your code here. */ } - + void Sender_exec_i::ccm_remove (void) { /* Your code here. */ } - + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Minimum_Sender_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_NORETURN ( retval, Sender_exec_i); - + return retval; } } @@ -113,47 +113,47 @@ namespace CIAO_Minimum_Sender_Impl //============================================================ // Home Executor Implementation Class: SenderHome_exec_i //============================================================ - + SenderHome_exec_i::SenderHome_exec_i (void) { } - + SenderHome_exec_i::~SenderHome_exec_i (void) { } - + // All operations and attributes. - + // Factory operations. - + // Finder operations. - + // Implicit operations. - + ::Components::EnterpriseComponent_ptr SenderHome_exec_i::create (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); - + ACE_NEW_THROW_EX ( retval, Sender_exec_i, ::CORBA::NO_MEMORY ()); - + return retval; } - + extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Minimum_SenderHome_Impl (void) { ::Components::HomeExecutorBase_ptr retval = ::Components::HomeExecutorBase::_nil (); - + ACE_NEW_NORETURN ( retval, SenderHome_exec_i); - + return retval; } } diff --git a/CIAO/tools/IDL3_to_IDL2/be_produce.cpp b/CIAO/tools/IDL3_to_IDL2/be_produce.cpp index 94619136efc..9800eb5b242 100644 --- a/CIAO/tools/IDL3_to_IDL2/be_produce.cpp +++ b/CIAO/tools/IDL3_to_IDL2/be_produce.cpp @@ -107,23 +107,23 @@ BE_produce (void) ACE_TEXT ("No Root\n"))); BE_abort (); } - + checking_visitor c_visitor; - + if (c_visitor.visit_root (ast_root) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce - failed") ACE_TEXT (" to accept checking visitor\n"))); - + BE_abort (); } - + // Create and launch the 'equivalent IDL' visitor only if IDL3 // declarations were seen by the checking visitor, or if we - // are not just including an IDL2-only original file in a new file. + // are not just including an IDL2-only original file in a new file. if (c_visitor.is_idl3 () || !be_global->encapsulate_idl2 ()) - { + { idl3_to_idl2_visitor visitor; if (visitor.visit_root (ast_root) == -1) @@ -141,7 +141,7 @@ BE_produce (void) "_IDL2.idl", "_TAO_IDL_", "_IDL_"); - + if (status == -1) { ACE_ERROR ((LM_ERROR, @@ -152,7 +152,7 @@ BE_produce (void) os = 0; BE_abort (); } - + *os << be_nl << be_nl << "#include \"" << idl_global->stripped_filename ()->get_string () diff --git a/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp b/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp index 02c674c12e9..7e2f2222d9b 100644 --- a/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp +++ b/CIAO/tools/IDL3_to_IDL2/identifier_helper.cpp @@ -12,7 +12,7 @@ IdentifierHelper::original_local_name (Identifier * local_name) { Identifier * id = 0; const char *lname = local_name->get_string (); - + // Remove _cxx_ if: // 1. it occurs and // 2. it occurs at the beginning of the string and @@ -20,10 +20,10 @@ IdentifierHelper::original_local_name (Identifier * local_name) if (ACE_OS::strstr (lname, "_cxx_") == lname) { TAO_IDL_CPP_Keyword_Table cpp_key_tbl; - + unsigned int len = static_cast<unsigned int> (ACE_OS::strlen (lname + 5)); - + const TAO_IDL_CPP_Keyword_Entry *entry = cpp_key_tbl.lookup (lname + 5, len); @@ -35,12 +35,12 @@ IdentifierHelper::original_local_name (Identifier * local_name) 0); } } - + if (id == 0) { id = local_name->copy (); } - + return id; } @@ -65,7 +65,7 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool appended_to) id = IdentifierHelper::original_local_name (i.item ()); i.next (); - + // Append the identifier. retval += appended_to && i.is_done () @@ -84,12 +84,12 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool appended_to) second = true; } } - + id->destroy (); delete id; id = 0; } - + return retval; } @@ -107,7 +107,7 @@ IdentifierHelper::is_idl_keyword (Identifier * local_name) return status == 0; } -ACE_CString +ACE_CString IdentifierHelper::try_escape (Identifier * local_name) { ACE_CString s_local_name (local_name->get_string ()); diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp index 840dfb74b8f..36f33fc5932 100644 --- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp +++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp @@ -44,13 +44,13 @@ idl3_to_idl2_visitor::visit_module (AST_Module *node) { return 0; } - + idl3p_checking_visitor v; - + /// Inherited visit_* methods must return int, but this /// visitor never returns anything but 0. (void) v.visit_scope (node); - + if (!v.needs_codegen ()) { /// We'd be generating an (illegal) empty module. @@ -148,7 +148,7 @@ idl3_to_idl2_visitor::visit_component (AST_Component *node) { return 0; } - + *os << be_nl << be_nl << "interface " << IdentifierHelper::try_escape (node->original_local_name ()).c_str (); @@ -161,7 +161,7 @@ idl3_to_idl2_visitor::visit_component (AST_Component *node) ? IdentifierHelper::orig_sn (base->name ()).c_str () : "Components::CCMObject") << be_idt; - + long nsupports = node->n_supports (); AST_Type **sups = node->supports (); @@ -210,14 +210,14 @@ int idl3_to_idl2_visitor::visit_provides (AST_Provides *node) { AST_Type *pt = node->provides_type (); - + /// These ports are always internal to the container, no /// equivalent IDL should be generated for them. if (pt->is_local ()) { return 0; } - + Identifier *orig_id = IdentifierHelper::original_local_name (node->local_name ()); @@ -247,7 +247,7 @@ idl3_to_idl2_visitor::visit_uses (AST_Uses *node) { return 0; } - + *os << be_nl << be_nl; Identifier *orig_id = @@ -257,7 +257,7 @@ idl3_to_idl2_visitor::visit_uses (AST_Uses *node) ACE_CString impl_str = IdentifierHelper::orig_sn (n); const char *impl_name = impl_str.c_str (); - + ACE_CString port_name (this->port_prefix_); port_name += orig_id->get_string (); const char *ext_port_name = port_name.c_str (); @@ -276,7 +276,7 @@ idl3_to_idl2_visitor::visit_uses (AST_Uses *node) << "typedef sequence<" << ext_port_name << "Connection> " << ext_port_name << "Connections;" << be_nl << be_nl; - + *os << "Components::Cookie connect_" << ext_port_name << " (in " << impl_name << " connection)" << be_idt_nl @@ -438,7 +438,7 @@ idl3_to_idl2_visitor::visit_mirror_port (AST_Mirror_Port *node) this->port_prefix_ = node->local_name ()->get_string (); this->port_prefix_ += '_'; } - + int status = this->visit_porttype_scope_mirror (node->port_type ()); @@ -548,7 +548,7 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node) { return 0; } - + this->home_ = node; ACE_CString explicit_name = node->original_local_name ()->get_string (); @@ -569,7 +569,7 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node) *os << IdentifierHelper::orig_sn (base->name (), true).c_str () << "Explicit"; } - + *os << be_idt; long nsupports = node->n_supports (); @@ -682,9 +682,9 @@ int idl3_to_idl2_visitor::visit_factory (AST_Factory *node) { Identifier *id = node->original_local_name (); - + *os << be_nl << be_nl; - + if (this->home_ == 0) { *os << "factory "; @@ -692,22 +692,22 @@ idl3_to_idl2_visitor::visit_factory (AST_Factory *node) else { AST_Component *c = this->home_->managed_component (); - + *os << IdentifierHelper::orig_sn (c->name ()).c_str () << " "; } - + *os << IdentifierHelper::try_escape (id).c_str () << " ("; - + this->gen_params (node, node->argument_count ()); - + *os << ")"; - + this->gen_exception_list (node->exceptions ()); - + *os << ";"; - + return 0; } diff --git a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp index ff25762a4df..b0bb85e673e 100644 --- a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp +++ b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.cpp @@ -26,7 +26,7 @@ idl3p_checking_visitor::visit_scope (UTL_Scope *node) /// No need to check the return value, there is no /// case where it returns anything but 0. (void) si.item ()->ast_accept (this); - + if (this->needs_codegen_) { /// No need to go any further. diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp index 6f2228fee60..702860d150b 100644 --- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp +++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp @@ -2103,7 +2103,7 @@ namespace DAnCE helper.write_DOM (this->dom_, ACE_TEXT_CHAR_TO_TCHAR (target_name.c_str ())); - + this->id_map_.close (); this->base_id_.reset (); } |