diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-02-10 18:25:28 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-02-10 18:25:28 +0000 |
| commit | 52519e6a88f501325cd09f8be3729c68db4d9455 (patch) | |
| tree | ed39e1d53e1cf3074c2c9eb05345b52ac888e17e | |
| parent | fee928e6aeddb9105428d16602705c81d35eeef9 (diff) | |
| download | ATCD-52519e6a88f501325cd09f8be3729c68db4d9455.tar.gz | |
ChangeLogTag: Tue Feb 10 18:18:41 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
138 files changed, 1471 insertions, 1396 deletions
diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index ae2dbc36602..7f16993e8f9 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,9 +1,151 @@ +Tue Feb 10 18:18:41 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/Deployment/Deployment.idl: + * DAnCE/Deployment/Deployment_Application.idl: + * DAnCE/Deployment/Deployment_ApplicationManager.idl: + * DAnCE/Deployment/Deployment_Base.idl: + * DAnCE/Deployment/Deployment_Connection.idl: + * DAnCE/Deployment/Deployment_Core.idl: + * DAnCE/Deployment/Deployment_Data.idl: + * DAnCE/Deployment/Deployment_DeploymentPlan.idl: + * DAnCE/Deployment/Deployment_DomainApplication.idl: + * DAnCE/Deployment/Deployment_DomainApplicationManager.idl: + * DAnCE/Deployment/Deployment_ExecutionManager.idl: + * DAnCE/Deployment/Deployment_NodeApplication.idl: + * DAnCE/Deployment/Deployment_NodeApplicationManager.idl: + * DAnCE/Deployment/Deployment_NodeManager.idl: + * DAnCE/Deployment/Deployment_Packaging_Data.idl: + * DAnCE/Deployment/Deployment_RepositoryManager.idl: + * DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl: + * DAnCE/Deployment/Deployment_TargetData.idl: + * DAnCE/Deployment/Deployment_TargetManager.idl: + * DAnCE/Deployment/Deployment_common.h: + * DAnCE/DomainApplication/Domain_Application_Impl.h: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + * DAnCE/ExecutionManager/ExecutionManager_Module.h: + * DAnCE/NodeApplication/ComponentInstallation_Impl.h: + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher.h: + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h: + * DAnCE/RedirectionService/CCMObjectLocator.cpp: + * DAnCE/RepositoryManager/RMadmin.cpp: + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp: + * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: + * DAnCE/Utils/Plan_Handler.h: + * DAnCE/Utils/Plan_Handler.cpp: + * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: + * DAnCE/tests/DeploymentPlanDump/test.cpp: + * DAnCE/tests/DeploymentPlanTestReferences/test.cpp: + * DAnCE/tests/DeploymentTest1/test.cpp: + * DAnCE/tests/MocksTest/MocksTest.cpp: + * DAnCE/tests/NameServiceTest/srv_main.cpp: + * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp: + * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp: + * DAnCE/tests/ObjectLocatorTest/Dummy.idl: + * DAnCE/tests/ObjectLocatorTest/clt_main.cpp: + * DAnCE/tests/ObjectLocatorTest/srv_main.cpp: + * DAnCE/tests/RedirectionServiceTest/Dummy.idl: + * DAnCE/tests/RedirectionServiceTest/clt_main.cpp: + * DAnCE/tests/RedirectionServiceTest/srv_main.cpp: + * ccm/ComponentServer/CCM_ComponentServer.idl: + * ccm/ComponentServer/CCM_ComponentServer_Base.idl: + * ccm/ComponentServer/CCM_ComponentServer_Client.idl: + * ciao/CIAO_FailureReasons.idl: + * ciao/Client_init.h: + * ciao/Client_init.cpp: + * ciao/ComponentServer/CIAO_CS_Client.idl: + * ciao/ComponentServer/CIAO_ComponentServer.idl: + * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: + * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp: + * ciao/ComponentServer/CIAO_Container_Impl.h: + * ciao/ComponentServer/CIAO_Container_Impl.cpp: + * ciao/ComponentServer/CIAO_Properties.idl: + * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: + * ciao/ComponentServer/Configurators/Basic_Config_Manager.h: + * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp: + * ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h: + * ciao/ComponentServer/Configurators/Server_Configurator.h: + * ciao/Containers/CIAO_Servant_Activator.idl: + * ciao/Containers/Container_Base.idl: + * ciao/Containers/Servant_Activator.h: + * ciao/Containers/Servant_Activator.cpp: + * ciao/Containers/Session/Session_Container.h: + * ciao/Containers/Session/Session_Container.idl: + * ciao/Containers/Session/Session_Container.cpp: + * ciao/Contexts/Context.mpc: + * ciao/Servants/CIAO_Port_Activator.idl: + * ciao/Servants/Home_Servant_Impl_Base.h: + * ciao/Servants/Home_Servant_Impl_T.cpp: + * ciao/Servants/Port_Activator.h: + * ciao/Servants/Servant_Impl_Base.cpp: + * ciao/Servants/Servant_Impl_Utils_T.cpp: + * ciao/Server_init.cpp: + * ciao/Valuetype_Factories/Factories.mpc: + * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp: + * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp: + * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: + * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: + * examples/BasicSP/EC/EC_exec.cpp: + * examples/BasicSP/EC/client.cpp: + * examples/BasicSP/EC/controller.cpp: + * examples/Display/GPS/GPS_exec.cpp: + * examples/Display/NavDisplay/NavDisplay_exec.cpp: + * examples/Null_Component/StaticDAnCEApp.cpp: + * examples/Swapping/Sender/starter.cpp: + * ofccm/Cdmw/CDMW_Deployment.idl: + * ofccm/NodeApplication/ComponentInstallation_Impl.h: + * performance-tests/Benchmark/Multi_Threaded/client.cpp: + * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl: + * performance-tests/Benchmark/RoundTrip/client.cpp: + * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl: + * performance-tests/Benchmark/RoundTripClient/client.cpp: + * performance-tests/Protocols/Receiver/Receiver_exec.cpp: + * performance-tests/Protocols/Sender/Sender_exec.cpp: + * performance-tests/mico/mico-thrput-st/client.cc: + * performance-tests/mico/mico-thrput-st/server.cc: + * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp: + * tests/CIAO_ComponentServer/Activator/client.cpp: + * tests/CIAO_ComponentServer/SimpleComponent/client.cpp: + * tools/Config_Handlers/Any_Handler.h: + * tools/Config_Handlers/Any_Handler.cpp: + * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h: + * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp: + * tools/Config_Handlers/CIAO_Events/test.cpp: + * tools/Config_Handlers/DD_Handler.h: + * tools/Config_Handlers/DD_Handler.cpp: + * tools/Config_Handlers/DP_Handler.h: + * tools/Config_Handlers/DP_Handler.cpp: + * tools/Config_Handlers/DynAny_Handler/dynany_test.idl: + * tools/Config_Handlers/DynAny_Handler/test.cpp: + * tools/Config_Handlers/DynAny_Handler/test.mpc: + * tools/Config_Handlers/ESD_Handler.h: + * tools/Config_Handlers/ESD_Handler.cpp: + * tools/Config_Handlers/IDD_Handler.h: + * tools/Config_Handlers/IDD_Handler.cpp: + * tools/Config_Handlers/IDREF_Base.h: + * tools/Config_Handlers/IDREF_Base.cpp: + * tools/Config_Handlers/Package_Handlers/test.cpp: + * tools/Config_Handlers/RT-CCM/OR_Handler.h: + * tools/Config_Handlers/RT-CCM/OR_Handler.cpp: + * tools/Config_Handlers/RT-CCM/SRD_Handler.h: + * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp: + * tools/Config_Handlers/RT-CCM/test.cpp: + * tools/Config_Handlers/XML_Typedefs.h: + * tools/Config_Handlers/test.cpp: + * tools/IDL3_to_IDL2/cdmw_idl.cpp: + * tools/XML/XercesString.cpp: + + Fuzz. + Fri Feb 6 22:06:51 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * bin/ciao_tests.lst: - - Added in tests that have been ported. - + + Added in tests that have been ported. + Fri Feb 6 20:28:09 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: diff --git a/flat/CIAO/DAnCE/Deployment/Deployment.idl b/flat/CIAO/DAnCE/Deployment/Deployment.idl index 2b46219b4c4..dabf69a0662 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment.idl @@ -7,30 +7,30 @@ #include "DAnCE/Deployment/Deployment_PlanError.idl" module Deployment { - exception InvalidProperty { - string name; - string reason; - }; - - exception InvalidNodeExecParameter { - string name; - string reason; - }; - - exception InvalidComponentExecParameter { - string name; - string reason; - }; - - exception NoSuchName { - }; - - exception LastConfiguration { - }; - - exception InvalidReference { - }; - //@! in DOCGroup added 1 additional exception and one structure + exception InvalidProperty { + string name; + string reason; + }; + + exception InvalidNodeExecParameter { + string name; + string reason; + }; + + exception InvalidComponentExecParameter { + string name; + string reason; + }; + + exception NoSuchName { + }; + + exception LastConfiguration { + }; + + exception InvalidReference { + }; + //@! in DOCGroup added 1 additional exception and one structure }; #endif /* DEPLOYMENT_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_Application.idl b/flat/CIAO/DAnCE/Deployment/Deployment_Application.idl index d6a5b00b263..4ef117a6546 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_Application.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_Application.idl @@ -7,26 +7,26 @@ module Deployment { - exception StartError { - string name; - string reason; - }; + exception StartError { + string name; + string reason; + }; - exception InvalidConnection { - string name; - string reason; - }; + exception InvalidConnection { + string name; + string reason; + }; - interface Application { - //@! in DOCGroup has additional parameter - void finishLaunch (in Connections providedReference, in boolean start) - raises (StartError, InvalidConnection); - - void start () - raises (StartError); - }; - - typedef sequence < Application > Applications; + interface Application { + //@! in DOCGroup has additional parameter + void finishLaunch (in Connections providedReference, in boolean start) + raises (StartError, InvalidConnection); + + void start () + raises (StartError); + }; + + typedef sequence < Application > Applications; }; #endif /* DEPLOYMENT_APPLICATION_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl index 7ee0f812fdf..6f35ae0bcb7 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl @@ -7,27 +7,27 @@ module Deployment { - exception ResourceNotAvailable { - string name; - string resourceType; - string propertyName; - string elementName; - string resourceName; - }; + exception ResourceNotAvailable { + string name; + string resourceType; + string propertyName; + string elementName; + string resourceName; + }; - interface ApplicationManager { - //@! in DOCGroup has additional parameter - Application startLaunch ( in Properties configProperty, - out Connections providedReference) - raises (ResourceNotAvailable, - StartError, - InvalidProperty, - InvalidNodeExecParameter, - InvalidComponentExecParameter); - - void destroyApplication (in Application app) - raises (StopError); - }; + interface ApplicationManager { + //@! in DOCGroup has additional parameter + Application startLaunch ( in Properties configProperty, + out Connections providedReference) + raises (ResourceNotAvailable, + StartError, + InvalidProperty, + InvalidNodeExecParameter, + InvalidComponentExecParameter); + + void destroyApplication (in Application app) + raises (StopError); + }; }; #endif /* DEPLOYMENT_APPLICATIONMANAGER_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_Base.idl b/flat/CIAO/DAnCE/Deployment/Deployment_Base.idl index 945769ad14e..c0db10ecb14 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_Base.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_Base.idl @@ -5,38 +5,38 @@ module Deployment { - struct Property { - string name; - any value; - }; - - typedef sequence < Property > Properties; - - struct Requirement { - string name; - string resourceType; - Properties property; - }; - - typedef sequence < Requirement > Requirements; - - enum SatisfierPropertyKind { - Quantity, - Capacity, - Minimum, - Maximum, - _Attribute, - Selection - }; - - struct SatisfierProperty { - string name; - SatisfierPropertyKind kind; - boolean dynamic; - any value; - }; - - typedef sequence < SatisfierProperty > SatisfierProperties; + struct Property { + string name; + any value; + }; + + typedef sequence < Property > Properties; + + struct Requirement { + string name; + string resourceType; + Properties property; + }; + + typedef sequence < Requirement > Requirements; + + enum SatisfierPropertyKind { + Quantity, + Capacity, + Minimum, + Maximum, + _Attribute, + Selection + }; + + struct SatisfierProperty { + string name; + SatisfierPropertyKind kind; + boolean dynamic; + any value; + }; + + typedef sequence < SatisfierProperty > SatisfierProperties; }; #endif /* DEPLOYMENT_BASE_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_Connection.idl b/flat/CIAO/DAnCE/Deployment/Deployment_Connection.idl index fe0cf75f5a6..d054e7e4602 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_Connection.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_Connection.idl @@ -9,13 +9,13 @@ module Deployment { - typedef sequence < Object > Endpoints; - //@! in DOCGroup this struct seriously extended - struct Connection { - string name; - Endpoints endpoint; - }; + typedef sequence < Object > Endpoints; + //@! in DOCGroup this struct seriously extended + struct Connection { + string name; + Endpoints endpoint; + }; - typedef sequence < Connection > Connections; + typedef sequence < Connection > Connections; }; #endif /* DEPLOYMENT_CONNECTION_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_Core.idl b/flat/CIAO/DAnCE/Deployment/Deployment_Core.idl index 5dec3bda9d6..1c1dcddc9ad 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_Core.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_Core.idl @@ -10,11 +10,11 @@ module Deployment { - //@! in DOCGroup three additional exceptions specified - exception StopError { - string name; - string reason; - }; + //@! in DOCGroup three additional exceptions specified + exception StopError { + string name; + string reason; + }; }; #endif /* DEPLOYMENT_CORE_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_Data.idl b/flat/CIAO/DAnCE/Deployment/Deployment_Data.idl index 0780036b421..84fa9de5a42 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_Data.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_Data.idl @@ -6,35 +6,35 @@ #include "DAnCE/Deployment/Deployment_DeploymentPlan.idl" module Deployment { - //@! in DOCGroup requiredType has type string - struct ComponentPackageReference { - string requiredUUID; - string requiredName; - ComponentInterfaceDescription requiredType; - }; - - typedef sequence < ComponentPackageReference > ComponentPackageReferences; - - typedef sequence < ResourceUsageKind > ResourceUsageKinds; - - struct ImplementationRequirement { - ResourceUsageKinds resourceUsage; - string resourcePort; - string componentPort; - string name; - string resourceType; - Properties property; - }; - - typedef sequence < ImplementationRequirement > ImplementationRequirements; - - struct Capability { - string name; - ::CORBA::StringSeq resourceType; - SatisfierProperties property; - }; - - typedef sequence < Capability > Capabilities; + //@! in DOCGroup requiredType has type string + struct ComponentPackageReference { + string requiredUUID; + string requiredName; + ComponentInterfaceDescription requiredType; + }; + + typedef sequence < ComponentPackageReference > ComponentPackageReferences; + + typedef sequence < ResourceUsageKind > ResourceUsageKinds; + + struct ImplementationRequirement { + ResourceUsageKinds resourceUsage; + string resourcePort; + string componentPort; + string name; + string resourceType; + Properties property; + }; + + typedef sequence < ImplementationRequirement > ImplementationRequirements; + + struct Capability { + string name; + ::CORBA::StringSeq resourceType; + SatisfierProperties property; + }; + + typedef sequence < Capability > Capabilities; }; diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl b/flat/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl index d75bbb92f4f..e56d00f99e8 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl @@ -9,200 +9,200 @@ #include "tao/Typecode_types.pidl" module Deployment { - enum CCMComponentPortKind { - Facet, - SimplexReceptacle, - MultiplexReceptacle, - EventEmitter, - EventPublisher, - EventConsumer - }; - - struct ComponentPortDescription { - string name; - string specificType; - ::CORBA::StringSeq supportedType; - boolean provider; - boolean exclusiveProvider; - boolean exclusiveUser; - boolean optional; - CCMComponentPortKind kind; - }; - - typedef sequence < ComponentPortDescription > ComponentPortDescriptions; - - struct ComponentPropertyDescription { - string name; - CORBA::TypeCode type; - }; - - typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions; - - struct ComponentInterfaceDescription { - string label; - string UUID; - string specificType; - ::CORBA::StringSeq supportedType; - ::CORBA::StringSeq idlFile; - Properties configProperty; - ComponentPortDescriptions port; - ComponentPropertyDescriptions property; - Properties infoProperty; - }; - - struct MonolithicDeploymentDescription { - string name; - ::CORBA::StringSeq source; - ::CORBA::ULongSeq artifactRef; - Properties execParameter; - Requirements deployRequirement; - }; - - typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions; - - enum ResourceUsageKind { - None, - InstanceUsesResource, - ResourceUsesInstance, - PortUsesResource, - ResourceUsesPort - }; - - struct InstanceResourceDeploymentDescription { - ResourceUsageKind resourceUsage; - string requirementName; - string resourceName; - Properties property; - }; - - typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions; - - struct InstanceDeploymentDescription { - string name; - string node; - ::CORBA::StringSeq source; - unsigned long implementationRef; - Properties configProperty; - InstanceResourceDeploymentDescriptions deployedResource; - InstanceResourceDeploymentDescriptions deployedSharedResource; - }; - - typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions; - - struct ComponentExternalPortEndpoint { - string portName; - }; - - typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints; - - struct PlanSubcomponentPortEndpoint { - string portName; - boolean provider; - CCMComponentPortKind kind; - unsigned long instanceRef; - }; - - typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints; - - //@! in DOCGroup provider, portName and supportesType are removed - struct ExternalReferenceEndpoint { - string location; - boolean provider; - string portName; - ::CORBA::StringSeq supportedType; - }; - - typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints; - - struct ConnectionResourceDeploymentDescription { - string targetName; - string requirementName; - string resourceName; - Properties property; - }; - - typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions; - - struct PlanConnectionDescription { - string name; - ::CORBA::StringSeq source; - Requirements deployRequirement; - ComponentExternalPortEndpoints externalEndpoint; - PlanSubcomponentPortEndpoints internalEndpoint; - ExternalReferenceEndpoints externalReference; - ConnectionResourceDeploymentDescriptions deployedResource; - }; - - typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions; - - struct PlanSubcomponentPropertyReference { - string propertyName; - unsigned long instanceRef; - }; - - typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences; - - struct PlanPropertyMapping { - string name; - ::CORBA::StringSeq source; - string externalName; - PlanSubcomponentPropertyReferences delegatesTo; - }; - - typedef sequence < PlanPropertyMapping > PlanPropertyMappings; - - struct ImplementationDependency { - string requiredType; - }; - - typedef sequence < ImplementationDependency > ImplementationDependencies; - - struct ResourceDeploymentDescription { - string requirementName; - string resourceName; - Properties property; - }; - - typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions; - - struct ArtifactDeploymentDescription { - string name; - ::CORBA::StringSeq location; - string node; - ::CORBA::StringSeq source; - Properties execParameter; - Requirements deployRequirement; - ResourceDeploymentDescriptions deployedResource; - }; - - typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions; - - enum PlanLocalityKind { - PlanSameProcess, - PlanDifferentProcess, - PlanNoConstraint - }; - - struct PlanLocality { - PlanLocalityKind constraint; - ::CORBA::ULongSeq constrainedInstanceRef; - }; - //@! in DOCGroup not implemented - typedef sequence < PlanLocality > PlanLocalities; - //@! in DOCGroup localityConstraint is commented - struct DeploymentPlan { - string label; - string UUID; - ComponentInterfaceDescription realizes; - MonolithicDeploymentDescriptions implementation; - InstanceDeploymentDescriptions instance; - PlanConnectionDescriptions connection; - PlanPropertyMappings externalProperty; - ImplementationDependencies dependsOn; - ArtifactDeploymentDescriptions artifact; - Properties infoProperty; - PlanLocalities localityConstraint; - }; + enum CCMComponentPortKind { + Facet, + SimplexReceptacle, + MultiplexReceptacle, + EventEmitter, + EventPublisher, + EventConsumer + }; + + struct ComponentPortDescription { + string name; + string specificType; + ::CORBA::StringSeq supportedType; + boolean provider; + boolean exclusiveProvider; + boolean exclusiveUser; + boolean optional; + CCMComponentPortKind kind; + }; + + typedef sequence < ComponentPortDescription > ComponentPortDescriptions; + + struct ComponentPropertyDescription { + string name; + CORBA::TypeCode type; + }; + + typedef sequence < ComponentPropertyDescription > ComponentPropertyDescriptions; + + struct ComponentInterfaceDescription { + string label; + string UUID; + string specificType; + ::CORBA::StringSeq supportedType; + ::CORBA::StringSeq idlFile; + Properties configProperty; + ComponentPortDescriptions port; + ComponentPropertyDescriptions property; + Properties infoProperty; + }; + + struct MonolithicDeploymentDescription { + string name; + ::CORBA::StringSeq source; + ::CORBA::ULongSeq artifactRef; + Properties execParameter; + Requirements deployRequirement; + }; + + typedef sequence < MonolithicDeploymentDescription > MonolithicDeploymentDescriptions; + + enum ResourceUsageKind { + None, + InstanceUsesResource, + ResourceUsesInstance, + PortUsesResource, + ResourceUsesPort + }; + + struct InstanceResourceDeploymentDescription { + ResourceUsageKind resourceUsage; + string requirementName; + string resourceName; + Properties property; + }; + + typedef sequence < InstanceResourceDeploymentDescription > InstanceResourceDeploymentDescriptions; + + struct InstanceDeploymentDescription { + string name; + string node; + ::CORBA::StringSeq source; + unsigned long implementationRef; + Properties configProperty; + InstanceResourceDeploymentDescriptions deployedResource; + InstanceResourceDeploymentDescriptions deployedSharedResource; + }; + + typedef sequence < InstanceDeploymentDescription > InstanceDeploymentDescriptions; + + struct ComponentExternalPortEndpoint { + string portName; + }; + + typedef sequence < ComponentExternalPortEndpoint > ComponentExternalPortEndpoints; + + struct PlanSubcomponentPortEndpoint { + string portName; + boolean provider; + CCMComponentPortKind kind; + unsigned long instanceRef; + }; + + typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints; + + //@! in DOCGroup provider, portName and supportesType are removed + struct ExternalReferenceEndpoint { + string location; + boolean provider; + string portName; + ::CORBA::StringSeq supportedType; + }; + + typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints; + + struct ConnectionResourceDeploymentDescription { + string targetName; + string requirementName; + string resourceName; + Properties property; + }; + + typedef sequence < ConnectionResourceDeploymentDescription > ConnectionResourceDeploymentDescriptions; + + struct PlanConnectionDescription { + string name; + ::CORBA::StringSeq source; + Requirements deployRequirement; + ComponentExternalPortEndpoints externalEndpoint; + PlanSubcomponentPortEndpoints internalEndpoint; + ExternalReferenceEndpoints externalReference; + ConnectionResourceDeploymentDescriptions deployedResource; + }; + + typedef sequence < PlanConnectionDescription > PlanConnectionDescriptions; + + struct PlanSubcomponentPropertyReference { + string propertyName; + unsigned long instanceRef; + }; + + typedef sequence < PlanSubcomponentPropertyReference > PlanSubcomponentPropertyReferences; + + struct PlanPropertyMapping { + string name; + ::CORBA::StringSeq source; + string externalName; + PlanSubcomponentPropertyReferences delegatesTo; + }; + + typedef sequence < PlanPropertyMapping > PlanPropertyMappings; + + struct ImplementationDependency { + string requiredType; + }; + + typedef sequence < ImplementationDependency > ImplementationDependencies; + + struct ResourceDeploymentDescription { + string requirementName; + string resourceName; + Properties property; + }; + + typedef sequence < ResourceDeploymentDescription > ResourceDeploymentDescriptions; + + struct ArtifactDeploymentDescription { + string name; + ::CORBA::StringSeq location; + string node; + ::CORBA::StringSeq source; + Properties execParameter; + Requirements deployRequirement; + ResourceDeploymentDescriptions deployedResource; + }; + + typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions; + + enum PlanLocalityKind { + PlanSameProcess, + PlanDifferentProcess, + PlanNoConstraint + }; + + struct PlanLocality { + PlanLocalityKind constraint; + ::CORBA::ULongSeq constrainedInstanceRef; + }; + //@! in DOCGroup not implemented + typedef sequence < PlanLocality > PlanLocalities; + //@! in DOCGroup localityConstraint is commented + struct DeploymentPlan { + string label; + string UUID; + ComponentInterfaceDescription realizes; + MonolithicDeploymentDescriptions implementation; + InstanceDeploymentDescriptions instance; + PlanConnectionDescriptions connection; + PlanPropertyMappings externalProperty; + ImplementationDependencies dependsOn; + ArtifactDeploymentDescriptions artifact; + Properties infoProperty; + PlanLocalities localityConstraint; + }; }; #endif /* DEPLOYMENT_DATA_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplication.idl b/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplication.idl index ff6dbc6247f..5bc0941aca9 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplication.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplication.idl @@ -8,10 +8,10 @@ module Deployment { - interface DomainApplication : - Application - { - }; + interface DomainApplication : + Application + { + }; }; diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplicationManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplicationManager.idl index 75031d7af0e..37930364044 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplicationManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_DomainApplicationManager.idl @@ -7,17 +7,17 @@ #include "DAnCE/Deployment/Deployment_ApplicationManager.idl" module Deployment { - /// CIAO 's DomainApplicationManager interface differs spec-defined interface - /// in the same that it also integrates the spec-defined interface for - /// DomainApplication into itself - interface DomainApplicationManager : - ApplicationManager - { - Applications getApplications (); - DeploymentPlan getPlan (); - }; - - typedef sequence < DomainApplicationManager > DomainApplicationManagers; + /// CIAO 's DomainApplicationManager interface differs spec-defined interface + /// in the same that it also integrates the spec-defined interface for + /// DomainApplication into itself + interface DomainApplicationManager : + ApplicationManager + { + Applications getApplications (); + DeploymentPlan getPlan (); + }; + + typedef sequence < DomainApplicationManager > DomainApplicationManagers; }; #endif /* DOMAINAPPLICATIONMANAGER_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_ExecutionManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_ExecutionManager.idl index fc7d418db84..00d415fde49 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_ExecutionManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_ExecutionManager.idl @@ -7,15 +7,15 @@ #include "DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl" module Deployment { - //@! in DOCGroup this interface has significant extensions - interface ExecutionManager { + //@! in DOCGroup this interface has significant extensions + interface ExecutionManager { DomainApplicationManager preparePlan (in DeploymentPlan plan, in ResourceCommitmentManager resourceCommitment) - raises (ResourceNotAvailable, PlanError, StartError); - DomainApplicationManagers getManagers (); - void destroyManager (in DomainApplicationManager manager) - raises (StopError); - }; + raises (ResourceNotAvailable, PlanError, StartError); + DomainApplicationManagers getManagers (); + void destroyManager (in DomainApplicationManager manager) + raises (StopError); + }; }; #endif /* EXECUTIONMANAGER_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplication.idl b/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplication.idl index fb46120c131..7e3900bd4dd 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplication.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplication.idl @@ -9,11 +9,11 @@ //#include "DAnCE/Deployment/Deployment_Events.idl" module Deployment { - //@! in DOCGroup NodeApplication has a lot extensions and additional types - interface NodeApplication : - Application - { - }; + //@! in DOCGroup NodeApplication has a lot extensions and additional types + interface NodeApplication : + Application + { + }; }; #endif /* DEPLOYMENT_NODEAPPLICATION_IDL */ - + diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplicationManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplicationManager.idl index 2ac17abaa5a..d0026d8408e 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplicationManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_NodeApplicationManager.idl @@ -7,10 +7,10 @@ #include "DAnCE/Deployment/Deployment.idl" module Deployment { - interface NodeApplicationManager : - ApplicationManager - { - }; + interface NodeApplicationManager : + ApplicationManager + { + }; }; #endif /* NODEAPPLICATIONMANAGER_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl index a79e3e111d6..f70aca19928 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl @@ -9,27 +9,27 @@ module Deployment { - interface Logger { - }; + interface Logger { + }; - //@! in DOCGroup this interface has a lot extensions - interface NodeManager { - void joinDomain ( in Domain theDomain, - in TargetManager manager, - in Logger log, - in long updateInterval); - - void leaveDomain (); - - NodeApplicationManager preparePlan (in DeploymentPlan plan, - in ResourceCommitmentManager resourceCommitment) - raises (StartError, PlanError); - - void destroyManager (in NodeApplicationManager appManager) - raises (StopError, InvalidReference); - - Resources getDynamicResources (); - }; + //@! in DOCGroup this interface has a lot extensions + interface NodeManager { + void joinDomain ( in Domain theDomain, + in TargetManager manager, + in Logger log, + in long updateInterval); + + void leaveDomain (); + + NodeApplicationManager preparePlan (in DeploymentPlan plan, + in ResourceCommitmentManager resourceCommitment) + raises (StartError, PlanError); + + void destroyManager (in NodeApplicationManager appManager) + raises (StopError, InvalidReference); + + Resources getDynamicResources (); + }; }; #endif /* NODEMANAGER_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl b/flat/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl index 7e014eb5891..e64327168f0 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl @@ -7,171 +7,171 @@ module Deployment { - struct ComponentPackageDescription; + struct ComponentPackageDescription; - typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions; - - struct PackageConfiguration; - - typedef sequence < PackageConfiguration > PackageConfigurations; - - struct ComponentPackageImport { - ::CORBA::StringSeq location; - }; - - typedef sequence < ComponentPackageImport > ComponentPackageImports; - - struct SubcomponentInstantiationDescription { - string name; - ComponentPackageDescriptions basePackage; - PackageConfigurations specializedConfig; - Requirements selectRequirement; - Properties configProperty; - ComponentPackageReferences referencedPackage; - ComponentPackageImports importedPackage; - }; - - typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions; - - struct SubcomponentPortEndpoint { - string portName; - unsigned long instanceRef; - }; - - typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints; - - struct AssemblyConnectionDescription { - string name; - Requirements deployRequirement; - ComponentExternalPortEndpoints externalEndpoint; - SubcomponentPortEndpoints internalEndpoint; - ExternalReferenceEndpoints externalReference; - }; - - typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions; - - struct SubcomponentPropertyReference { - string propertyName; - unsigned long instanceRef; - }; - - typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences; - - struct AssemblyPropertyMapping { - string name; - string externalName; - SubcomponentPropertyReferences delegatesTo; - }; - - typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings; - - struct NamedImplementationArtifact; - - typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts; - - struct ImplementationArtifactDescription { - string label; - string UUID; - ::CORBA::StringSeq location; - Properties execParameter; - Requirements deployRequirement; - NamedImplementationArtifacts dependsOn; - Properties infoProperty; - }; - - struct NamedImplementationArtifact { - string name; - ImplementationArtifactDescription referencedArtifact; - }; - - struct MonolithicImplementationDescription { - Properties nodeExecParameter; - NamedImplementationArtifacts primaryArtifact; - ImplementationRequirements deployRequirement; - Properties componentExecParameter; - }; - - typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions; - - enum LocalityKind { - SameNodeAnyProcess, - SameNodeSameProcess, - SameNodeDifferentProcess, - DifferentNode, - DifferentProcess, - NoConstraint - }; - - struct Locality { - LocalityKind constraint; - ::CORBA::ULongSeq constrainedInstanceRef; - }; - - typedef sequence < Locality > Localities; - - struct ComponentAssemblyDescription { - SubcomponentInstantiationDescriptions instance; - AssemblyConnectionDescriptions connection; - AssemblyPropertyMappings externalProperty; - Localities localityConstraint; - }; - - typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions; - - struct ComponentImplementationDescription { - string label; - string UUID; - ComponentInterfaceDescription implements; - ComponentAssemblyDescriptions assemblyImpl; - MonolithicImplementationDescriptions monolithicImpl; - Properties configProperty; - Capabilities capability; - ImplementationDependencies dependsOn; - Properties infoProperty; - }; - - struct PackagedComponentImplementation { - string name; - ComponentImplementationDescription referencedImplementation; - }; - - typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations; - - struct ComponentPackageDescription { - string label; - string UUID; - ComponentInterfaceDescription realizes; - Properties configProperty; - PackagedComponentImplementations implementation; - Properties infoProperty; - }; - - struct PackageConfiguration { - string label; - string UUID; - ComponentPackageDescriptions basePackage; - PackageConfigurations specializedConfig; - Requirements selectRequirement; - Properties configProperty; - ComponentPackageReferences referencedPackage; - ComponentPackageImports importedPackage; - }; - - struct ComponentUsageDescription { - ComponentPackageDescriptions basePackage; - PackageConfigurations specializedConfig; - Requirements selectRequirement; - Properties configProperty; - ComponentPackageReferences referencedPackage; - ComponentPackageImports importedPackage; - }; - - struct RequirementSatisfier { - string name; - ::CORBA::StringSeq resourceType; - SatisfierProperties property; - }; - + typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions; + + struct PackageConfiguration; + + typedef sequence < PackageConfiguration > PackageConfigurations; + + struct ComponentPackageImport { + ::CORBA::StringSeq location; + }; + + typedef sequence < ComponentPackageImport > ComponentPackageImports; + + struct SubcomponentInstantiationDescription { + string name; + ComponentPackageDescriptions basePackage; + PackageConfigurations specializedConfig; + Requirements selectRequirement; + Properties configProperty; + ComponentPackageReferences referencedPackage; + ComponentPackageImports importedPackage; + }; + + typedef sequence < SubcomponentInstantiationDescription > SubcomponentInstantiationDescriptions; + + struct SubcomponentPortEndpoint { + string portName; + unsigned long instanceRef; + }; + + typedef sequence < SubcomponentPortEndpoint > SubcomponentPortEndpoints; + + struct AssemblyConnectionDescription { + string name; + Requirements deployRequirement; + ComponentExternalPortEndpoints externalEndpoint; + SubcomponentPortEndpoints internalEndpoint; + ExternalReferenceEndpoints externalReference; + }; + + typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions; + + struct SubcomponentPropertyReference { + string propertyName; + unsigned long instanceRef; + }; + + typedef sequence < SubcomponentPropertyReference > SubcomponentPropertyReferences; + + struct AssemblyPropertyMapping { + string name; + string externalName; + SubcomponentPropertyReferences delegatesTo; + }; + + typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings; + + struct NamedImplementationArtifact; + + typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts; + + struct ImplementationArtifactDescription { + string label; + string UUID; + ::CORBA::StringSeq location; + Properties execParameter; + Requirements deployRequirement; + NamedImplementationArtifacts dependsOn; + Properties infoProperty; + }; + + struct NamedImplementationArtifact { + string name; + ImplementationArtifactDescription referencedArtifact; + }; + + struct MonolithicImplementationDescription { + Properties nodeExecParameter; + NamedImplementationArtifacts primaryArtifact; + ImplementationRequirements deployRequirement; + Properties componentExecParameter; + }; + + typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions; + + enum LocalityKind { + SameNodeAnyProcess, + SameNodeSameProcess, + SameNodeDifferentProcess, + DifferentNode, + DifferentProcess, + NoConstraint + }; + + struct Locality { + LocalityKind constraint; + ::CORBA::ULongSeq constrainedInstanceRef; + }; + + typedef sequence < Locality > Localities; + + struct ComponentAssemblyDescription { + SubcomponentInstantiationDescriptions instance; + AssemblyConnectionDescriptions connection; + AssemblyPropertyMappings externalProperty; + Localities localityConstraint; + }; + + typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions; + + struct ComponentImplementationDescription { + string label; + string UUID; + ComponentInterfaceDescription implements; + ComponentAssemblyDescriptions assemblyImpl; + MonolithicImplementationDescriptions monolithicImpl; + Properties configProperty; + Capabilities capability; + ImplementationDependencies dependsOn; + Properties infoProperty; + }; + + struct PackagedComponentImplementation { + string name; + ComponentImplementationDescription referencedImplementation; + }; + + typedef sequence < PackagedComponentImplementation > PackagedComponentImplementations; + + struct ComponentPackageDescription { + string label; + string UUID; + ComponentInterfaceDescription realizes; + Properties configProperty; + PackagedComponentImplementations implementation; + Properties infoProperty; + }; + + struct PackageConfiguration { + string label; + string UUID; + ComponentPackageDescriptions basePackage; + PackageConfigurations specializedConfig; + Requirements selectRequirement; + Properties configProperty; + ComponentPackageReferences referencedPackage; + ComponentPackageImports importedPackage; + }; + + struct ComponentUsageDescription { + ComponentPackageDescriptions basePackage; + PackageConfigurations specializedConfig; + Requirements selectRequirement; + Properties configProperty; + ComponentPackageReferences referencedPackage; + ComponentPackageImports importedPackage; + }; + + struct RequirementSatisfier { + string name; + ::CORBA::StringSeq resourceType; + SatisfierProperties property; + }; + }; #endif /* PACKAGING_DATA_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl index 2c74f033833..c0484094017 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl @@ -7,41 +7,41 @@ module Deployment { - exception NameExists { - }; + exception NameExists { + }; - exception PackageError { - string source; - string reason; - }; + exception PackageError { + string source; + string reason; + }; - interface RepositoryManager { - void installPackage ( in string installationName, - in string location, - in boolean replace) - raises (NameExists, PackageError); - - void createPackage (in string installationName, - in PackageConfiguration package, - in string baseLocation, - in boolean replace) - raises (NameExists, PackageError); - - PackageConfiguration findPackageByName (in string name) - raises (NoSuchName); - - PackageConfiguration findPackageByUUID (in string UUID) - raises (NoSuchName); - - ::CORBA::StringSeq findNamesByType (in string type); - - ::CORBA::StringSeq getAllNames (); - - ::CORBA::StringSeq getAllTypes (); - - void deletePackage (in string installationName) - raises (NoSuchName); - }; + interface RepositoryManager { + void installPackage ( in string installationName, + in string location, + in boolean replace) + raises (NameExists, PackageError); + + void createPackage (in string installationName, + in PackageConfiguration package, + in string baseLocation, + in boolean replace) + raises (NameExists, PackageError); + + PackageConfiguration findPackageByName (in string name) + raises (NoSuchName); + + PackageConfiguration findPackageByUUID (in string UUID) + raises (NoSuchName); + + ::CORBA::StringSeq findNamesByType (in string type); + + ::CORBA::StringSeq getAllNames (); + + ::CORBA::StringSeq getAllTypes (); + + void deletePackage (in string installationName) + raises (NoSuchName); + }; }; #endif /* REPOSITOR_MANAGER_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl index 0ef50a5470e..346c2626950 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl @@ -8,27 +8,27 @@ module Deployment { - struct ResourceAllocation { - string elementName; - string resourceName; - Properties property; - }; - - typedef sequence < ResourceAllocation > ResourceAllocations; - - exception ResourceCommitmentFailure { - string reason; - long index; - string propertyName; - ::CORBA::AnySeq propertyValue; - }; - - interface ResourceCommitmentManager { - void commitResources (in ResourceAllocations resources) - raises (ResourceCommitmentFailure); - void releaseResources (in ResourceAllocations resources) - raises (ResourceCommitmentFailure); - }; + struct ResourceAllocation { + string elementName; + string resourceName; + Properties property; + }; + + typedef sequence < ResourceAllocation > ResourceAllocations; + + exception ResourceCommitmentFailure { + string reason; + long index; + string propertyName; + ::CORBA::AnySeq propertyValue; + }; + + interface ResourceCommitmentManager { + void commitResources (in ResourceAllocations resources) + raises (ResourceCommitmentFailure); + void releaseResources (in ResourceAllocations resources) + raises (ResourceCommitmentFailure); + }; }; diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_TargetData.idl b/flat/CIAO/DAnCE/Deployment/Deployment_TargetData.idl index 8b2b127dcba..f0ec9732afd 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_TargetData.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_TargetData.idl @@ -9,61 +9,61 @@ module Deployment { - struct Resource { - string name; - ::CORBA::StringSeq resourceType; - SatisfierProperties property; - }; + struct Resource { + string name; + ::CORBA::StringSeq resourceType; + SatisfierProperties property; + }; - typedef sequence < Resource > Resources; + typedef sequence < Resource > Resources; - struct SharedResource { - string name; - ::CORBA::StringSeq resourceType; - ::CORBA::ULongSeq nodeRef; - SatisfierProperties property; - }; - - typedef sequence < SharedResource > SharedResources; + struct SharedResource { + string name; + ::CORBA::StringSeq resourceType; + ::CORBA::ULongSeq nodeRef; + SatisfierProperties property; + }; + + typedef sequence < SharedResource > SharedResources; - struct Node { - string name; - string label; - ::CORBA::ULongSeq sharedResourceRef; - ::CORBA::ULongSeq connectionRef; - Resources resource; - }; + struct Node { + string name; + string label; + ::CORBA::ULongSeq sharedResourceRef; + ::CORBA::ULongSeq connectionRef; + Resources resource; + }; - typedef sequence < Node > Nodes; + typedef sequence < Node > Nodes; - struct Interconnect { - string name; - string label; - ::CORBA::ULongSeq connectionRef; - ::CORBA::ULongSeq connectRef; - Resources resource; - }; + struct Interconnect { + string name; + string label; + ::CORBA::ULongSeq connectionRef; + ::CORBA::ULongSeq connectRef; + Resources resource; + }; - typedef sequence < Interconnect > Interconnects; + typedef sequence < Interconnect > Interconnects; - struct Bridge { - string name; - string label; - ::CORBA::ULongSeq connectRef; - Resources resource; - }; + struct Bridge { + string name; + string label; + ::CORBA::ULongSeq connectRef; + Resources resource; + }; - typedef sequence < Bridge > Bridges; + typedef sequence < Bridge > Bridges; - struct Domain { - string UUID; - string label; - SharedResources sharedResource; - Nodes node; - Interconnects interconnect; - Bridges bridge; - Properties infoProperty; - }; + struct Domain { + string UUID; + string label; + SharedResources sharedResource; + Nodes node; + Interconnects interconnect; + Bridges bridge; + Properties infoProperty; + }; }; #endif /* DEPLOYMENT_TARGETDATA_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl b/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl index 7e74ae2b8bd..d313227a352 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl +++ b/flat/CIAO/DAnCE/Deployment/Deployment_TargetManager.idl @@ -18,22 +18,22 @@ module Deployment { UpdateDynamic }; - interface TargetManager { + interface TargetManager { - Domain getAllResources (); + Domain getAllResources (); - Domain getAvailableResources (); + Domain getAvailableResources (); - //@! in DOCGroup renamed to createResourceCommitment - ResourceCommitmentManager commitResources (in ResourceAllocations resources) - raises (ResourceCommitmentFailure); + //@! in DOCGroup renamed to createResourceCommitment + ResourceCommitmentManager commitResources (in ResourceAllocations resources) + raises (ResourceCommitmentFailure); - void destroyResourceCommitment (in ResourceCommitmentManager manager); + void destroyResourceCommitment (in ResourceCommitmentManager manager); - void updateDomain ( in ::CORBA::StringSeq elements, - in Domain domainSubset, - in DomainUpdateKind updateKind); - }; + void updateDomain ( in ::CORBA::StringSeq elements, + in Domain domainSubset, + in DomainUpdateKind updateKind); + }; }; #endif /* TARGETMANAGER_IDL */ diff --git a/flat/CIAO/DAnCE/Deployment/Deployment_common.h b/flat/CIAO/DAnCE/Deployment/Deployment_common.h index 2346b4de2ef..dfd44797069 100644 --- a/flat/CIAO/DAnCE/Deployment/Deployment_common.h +++ b/flat/CIAO/DAnCE/Deployment/Deployment_common.h @@ -11,7 +11,7 @@ #ifndef DANCE_COMMON_H #define DANCE_COMMON_H -#include /**/ <ace/pre.h> +#include /**/ "ace/pre.h" #include "ace/config-all.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h index a81c8426a21..f03972c983a 100644 --- a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h +++ b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h @@ -1,6 +1,6 @@ /**======================================================== * - * @file DomainApplication_Impl.h + * @file DomainApplication_Impl_Impl.h * * @Brief This file contains the implementation of * the DomainApplication interface. diff --git a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 47f85e19812..b9956127f84 100644 --- a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -483,8 +483,8 @@ DomainApplicationManager_Impl::preparePlan() catch (CORBA::Exception &ex) { DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Caught a CORBA exception, propagating StartError: %s\n", - ex._info ().c_str ())); + "Caught a CORBA exception, propagating StartError: %s\n", + ex._info ().c_str ())); throw ::Deployment::StartError (); } catch (...) diff --git a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h index afcc24b0027..869c2b093d4 100644 --- a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h +++ b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h @@ -2,7 +2,7 @@ //============================================================================= /** - * @file Execution_Manager_Module.h + * @file ExecutionManager_Module.h * * $Id$ * diff --git a/flat/CIAO/DAnCE/NodeApplication/ComponentInstallation_Impl.h b/flat/CIAO/DAnCE/NodeApplication/ComponentInstallation_Impl.h index 04fd984079f..3b3dc1a4246 100644 --- a/flat/CIAO/DAnCE/NodeApplication/ComponentInstallation_Impl.h +++ b/flat/CIAO/DAnCE/NodeApplication/ComponentInstallation_Impl.h @@ -2,7 +2,7 @@ //============================================================================= /** - * @file ComponentInstallation.h + * @file ComponentInstallation_Impl.h * * $Id$ * diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 040a1b74b26..b5250b701b0 100644 --- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -44,9 +44,9 @@ namespace if (properties.find (name, any) == 0) { if (any >>= val) - { + { return true; - } + } else { DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " @@ -74,9 +74,9 @@ namespace if (properties.find (name, any) == 0) { if (any >>= CORBA::Any::to_boolean(val)) - { + { return true; - } + } else { DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<T> - " @@ -104,9 +104,9 @@ namespace if (properties.find (name, any) == 0) { if (any >>= CORBA::Any::to_string(val, 0)) - { + { return true; - } + } else { DANCE_ERROR ((LM_WARNING, DLINFO "NodeApplicion::<anonymous>::get_property_value<const char *> - " @@ -876,14 +876,14 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst) Components::CCMObject_var ccm_obj = home->create_component (); if (CORBA::is_nil (ccm_obj)) - { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " + { + DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_homed_component - " "Received nil component reference from create_component on home %C " " while creating component %C\n", - home_id, idd.name.in ())); - throw Deployment::StartError (idd.name.in (), - "Home for explicitly homed component returned nil"); - } + home_id, idd.name.in ())); + throw Deployment::StartError (idd.name.in (), + "Home for explicitly homed component returned nil"); + } inst.ref = CORBA::Object::_narrow (ccm_obj.in ()); DANCE_DEBUG ((LM_INFO, DLINFO "NodeApplication_Impl::install_homed_component - " @@ -952,7 +952,7 @@ NodeApplication_Impl::create_component_server (size_t index) "Components::Deployment::ServerActivator_var::create_component_server() " "returned ::Components::CreateFailure exception\n")); throw ::Deployment::StartError("", - "Received a ::Components::CreateFailure exception while creating component server."); + "Received a ::Components::CreateFailure exception while creating component server."); } catch (const ::Components::Deployment::InvalidConfiguration& ) { @@ -960,7 +960,7 @@ NodeApplication_Impl::create_component_server (size_t index) "Components::Deployment::ServerActivator_var::create_component_server() " "returned ::Components::Deployment::InvalidConfiguration exception\n")); throw ::Deployment::InvalidProperty("", - "::Components::Deployment::InvalidConfiguration exception caught while creating server"); + "::Components::Deployment::InvalidConfiguration exception caught while creating server"); } try @@ -1522,10 +1522,10 @@ NodeApplication_Impl::create_config_values (const Deployment::Properties& /*prop default: { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::create_config_values - " - "request is not a know type: eCreateComponentServer, eCreateContainer, " - "eInstallHome, eCreateComponentWithConfigValues\n")); + "request is not a know type: eCreateComponentServer, eCreateContainer, " + "eInstallHome, eCreateComponentWithConfigValues\n")); throw ::Deployment::InvalidProperty("", - "Invalid creation type for filling in config values"); + "Invalid creation type for filling in config values"); } } } @@ -1620,10 +1620,10 @@ NodeApplication_Impl::getAllConnections() DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::getAllConnections - " "Components::CCMObject_var::provide_facet() returned " "::Components::InvalidName exception for connection %C and port %C\n", - this->plan_.connection[i].name.in (), - this->plan_.connection[i].internalEndpoint[j].portName.in ())); + this->plan_.connection[i].name.in (), + this->plan_.connection[i].internalEndpoint[j].portName.in ())); throw ::Deployment::InvalidProperty(this->plan_.connection[i].name.in (), - "Container returned InvalidName"); + "Container returned InvalidName"); } break; } @@ -1651,10 +1651,10 @@ NodeApplication_Impl::getAllConnections() DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::getAllConnections - " "Components::CCMObject_var::get_consumer() returned " "::Components::InvalidName exception for connection %C and port %C\n", - this->plan_.connection[i].name.in (), - this->plan_.connection[i].internalEndpoint[j].portName.in ())); + this->plan_.connection[i].name.in (), + this->plan_.connection[i].internalEndpoint[j].portName.in ())); throw ::Deployment::InvalidProperty(this->plan_.connection[i].name.in (), - "Container returned InvalidName exception"); + "Container returned InvalidName exception"); } break; } @@ -1664,7 +1664,7 @@ NodeApplication_Impl::getAllConnections() "Connection.InternalEndPoint.Kind is not a " "Deployment::Facet or Deployment::EventConsumer\n")); throw ::Deployment::InvalidProperty(this->plan_.connection[i].name.in (), - "Invalid connection type, should be Facet or EventConsumer"); + "Invalid connection type, should be Facet or EventConsumer"); } } // index++; @@ -1739,168 +1739,168 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe if (name.compare (providedReference[i].name.in()) == 0) { - try - { - switch (conn.internalEndpoint[0].kind) - { - case Deployment::Facet: - { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "set for facet %C \n", name.c_str ())); - Components::CCMObject_var ext_inst; - try - { - if (0 == conn.externalReference.length()) - { - if (conn.internalEndpoint.length () == 2 && - (conn.internalEndpoint[1].kind == Deployment::MultiplexReceptacle || - conn.internalEndpoint[1].kind == Deployment::SimplexReceptacle)) - { - obj = Components::CCMObject:: - _narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->ref.in ()); - - this->connect_receptacle (obj.in (), - conn.internalEndpoint[1].portName.in(), - providedReference[i].endpoint[0].in()); - } - /* - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "Unsupported facet connection; lacks either external reference or " - "multiple internalEndpoints.\n")); - throw ::Deployment::StartError (name.c_str (), - "Unsupported facet connection; lacks either external reference " - "or multiple internalEndpoints.\n"); - */ - break; - } - CORBA::Object_var tmp = - this->orb_->string_to_object (conn.externalReference[0].location.in()); - ext_inst = Components::CCMObject::_narrow (tmp); - if (CORBA::is_nil (ext_inst.in())) - { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "facet for %C can't be narrowed \n", name.c_str ())); - break; - } - this->connect_receptacle_ext (ext_inst, - conn.externalReference[0].portName.in(), - providedReference[i].endpoint[0].in()); - } - catch (const CORBA::OBJECT_NOT_EXIST&) - { - // @@TODO: Shouldn't this be an error?!? - break; - } - catch (const CORBA::TRANSIENT&) - { - // @@TODO: Shouldn't this be an error?!? - break; - } - - break; - } - case Deployment::EventConsumer: - { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for consumer \n")); - Components::CCMObject_var ext_inst; - try - { - if (0 == conn.externalReference.length()) - { - break; - } - CORBA::Object_var tmp = - this->orb_->string_to_object (conn.externalReference[0].location.in()); - ext_inst = Components::CCMObject::_narrow (tmp); - if (CORBA::is_nil (ext_inst.in())) - { - DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "reference for %C can't be narrowed \n", name.c_str ())); - throw ::Deployment::InvalidConnection(conn.name.in (), - "Couldn't narrow reference for external reference"); - break; - } - try - { - // Check is connection kind is consumer to emitter? - this->connect_emitter_ext (ext_inst, - conn.externalReference[0].portName.in(), - providedReference[i].endpoint[0].in()); - } - catch (const ::Components::InvalidName&) - { - // No this is consumer to publisher - this->connect_publisher (ext_inst, - conn.externalReference[0].portName.in(), - providedReference[i].endpoint[0].in()); - } - } - catch (const CORBA::OBJECT_NOT_EXIST&) - { - break; - } - catch (const CORBA::TRANSIENT&) - { - break; - } - break; - } - case Deployment::MultiplexReceptacle: - case Deployment::SimplexReceptacle: - { - // What we should do with Cookie, returned from connect call??? - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for receptacle \n")); - this->connect_receptacle (obj.in(), - conn.internalEndpoint[0].portName.in(), - providedReference[i].endpoint[0].in()); - break; - } - case Deployment::EventEmitter: - { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for emitter \n")); - this->connect_emitter (obj.in(), - conn.internalEndpoint[0].portName.in(), - providedReference[i].endpoint[0].in()); - break; - } - case Deployment::EventPublisher: - { - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for publisher \n")); - this->connect_publisher (obj.in(), - conn.internalEndpoint[0].portName.in(), - providedReference[i].endpoint[0].in()); - break; - } - default: - { - DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - currect Connection.InternalEndPoint.Kind " - "is not a Deployment::SimplexReceptacle, Deployment::EventEmitter, Deployment::EventPublisher " - "(Connection:%C Kind:%i PortName:%C)\n", - conn.name.in(), - conn.internalEndpoint[0].kind, - conn.internalEndpoint[0].portName.in() - )); - throw ::Deployment::InvalidConnection(conn.name.in (), - "Invalid connection type, should be Receptacle or even producer."); - }//default - }//switch - } - catch (::Deployment::StartError &ex) - { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "Intercepted StartError exception while configuring %C conneciton, rethrowing\n", - name.c_str ())); - ex.name = name.c_str (); - throw; - } - catch (::Deployment::InvalidConnection &ex) - { - DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " - "Intercepted InvalidConnection exception while configuring %C conneciton, rethrowing\n", - name.c_str ())); - ex.name = name.c_str (); - throw; - } + try + { + switch (conn.internalEndpoint[0].kind) + { + case Deployment::Facet: + { + DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " + "set for facet %C \n", name.c_str ())); + Components::CCMObject_var ext_inst; + try + { + if (0 == conn.externalReference.length()) + { + if (conn.internalEndpoint.length () == 2 && + (conn.internalEndpoint[1].kind == Deployment::MultiplexReceptacle || + conn.internalEndpoint[1].kind == Deployment::SimplexReceptacle)) + { + obj = Components::CCMObject:: + _narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->ref.in ()); + + this->connect_receptacle (obj.in (), + conn.internalEndpoint[1].portName.in(), + providedReference[i].endpoint[0].in()); + } + /* + DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " + "Unsupported facet connection; lacks either external reference or " + "multiple internalEndpoints.\n")); + throw ::Deployment::StartError (name.c_str (), + "Unsupported facet connection; lacks either external reference " + "or multiple internalEndpoints.\n"); + */ + break; + } + CORBA::Object_var tmp = + this->orb_->string_to_object (conn.externalReference[0].location.in()); + ext_inst = Components::CCMObject::_narrow (tmp); + if (CORBA::is_nil (ext_inst.in())) + { + DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " + "facet for %C can't be narrowed \n", name.c_str ())); + break; + } + this->connect_receptacle_ext (ext_inst, + conn.externalReference[0].portName.in(), + providedReference[i].endpoint[0].in()); + } + catch (const CORBA::OBJECT_NOT_EXIST&) + { + // @@TODO: Shouldn't this be an error?!? + break; + } + catch (const CORBA::TRANSIENT&) + { + // @@TODO: Shouldn't this be an error?!? + break; + } + + break; + } + case Deployment::EventConsumer: + { + DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for consumer \n")); + Components::CCMObject_var ext_inst; + try + { + if (0 == conn.externalReference.length()) + { + break; + } + CORBA::Object_var tmp = + this->orb_->string_to_object (conn.externalReference[0].location.in()); + ext_inst = Components::CCMObject::_narrow (tmp); + if (CORBA::is_nil (ext_inst.in())) + { + DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " + "reference for %C can't be narrowed \n", name.c_str ())); + throw ::Deployment::InvalidConnection(conn.name.in (), + "Couldn't narrow reference for external reference"); + break; + } + try + { + // Check is connection kind is consumer to emitter? + this->connect_emitter_ext (ext_inst, + conn.externalReference[0].portName.in(), + providedReference[i].endpoint[0].in()); + } + catch (const ::Components::InvalidName&) + { + // No this is consumer to publisher + this->connect_publisher (ext_inst, + conn.externalReference[0].portName.in(), + providedReference[i].endpoint[0].in()); + } + } + catch (const CORBA::OBJECT_NOT_EXIST&) + { + break; + } + catch (const CORBA::TRANSIENT&) + { + break; + } + break; + } + case Deployment::MultiplexReceptacle: + case Deployment::SimplexReceptacle: + { + // What we should do with Cookie, returned from connect call??? + DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for receptacle \n")); + this->connect_receptacle (obj.in(), + conn.internalEndpoint[0].portName.in(), + providedReference[i].endpoint[0].in()); + break; + } + case Deployment::EventEmitter: + { + DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for emitter \n")); + this->connect_emitter (obj.in(), + conn.internalEndpoint[0].portName.in(), + providedReference[i].endpoint[0].in()); + break; + } + case Deployment::EventPublisher: + { + DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for publisher \n")); + this->connect_publisher (obj.in(), + conn.internalEndpoint[0].portName.in(), + providedReference[i].endpoint[0].in()); + break; + } + default: + { + DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - currect Connection.InternalEndPoint.Kind " + "is not a Deployment::SimplexReceptacle, Deployment::EventEmitter, Deployment::EventPublisher " + "(Connection:%C Kind:%i PortName:%C)\n", + conn.name.in(), + conn.internalEndpoint[0].kind, + conn.internalEndpoint[0].portName.in() + )); + throw ::Deployment::InvalidConnection(conn.name.in (), + "Invalid connection type, should be Receptacle or even producer."); + }//default + }//switch + } + catch (::Deployment::StartError &ex) + { + DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " + "Intercepted StartError exception while configuring %C conneciton, rethrowing\n", + name.c_str ())); + ex.name = name.c_str (); + throw; + } + catch (::Deployment::InvalidConnection &ex) + { + DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - " + "Intercepted InvalidConnection exception while configuring %C conneciton, rethrowing\n", + name.c_str ())); + ex.name = name.c_str (); + throw; + } }//if(name.compare(providedReference[i].name.in()) == 0) }//for ( unsigned int i = 0; i < providedReference.length(); ++i ) }//for ( unsigned int j = 0; j < this->plan_.connection.length(); ++j ) @@ -1933,28 +1933,28 @@ NodeApplication_Impl::connect_receptacle (Components::CCMObject_ptr inst, DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n")); throw ::Deployment::StartError("", - "Received InvalidName exception while connecting receptacle."); + "Received InvalidName exception while connecting receptacle."); } catch (const ::Components::InvalidConnection& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::InvalidConnection exception\n")); throw ::Deployment::InvalidConnection("", - "InvalidConnection caught while connecting receptacle."); + "InvalidConnection caught while connecting receptacle."); } catch (const ::Components::AlreadyConnected& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::AlreadyConnected exception\n")); throw ::Deployment::InvalidConnection("", - "Caught AlredyConnected exception while connecting receptacle"); + "Caught AlredyConnected exception while connecting receptacle"); } catch (const ::Components::ExceededConnectionLimit& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::ExceededConnectionLimit exception\n")); throw ::Deployment::InvalidConnection("", - "Caught ExceededConnectionLimit exception while connecting receptacle."); + "Caught ExceededConnectionLimit exception while connecting receptacle."); } return res; } @@ -1977,28 +1977,28 @@ NodeApplication_Impl::connect_receptacle_ext (Components::CCMObject_ptr inst, DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n")); throw ::Deployment::StartError("", - "Caught InvalidName exception while connecting external receptacle."); + "Caught InvalidName exception while connecting external receptacle."); } catch (const ::Components::InvalidConnection& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::InvalidConnection exception\n")); throw ::Deployment::InvalidConnection("", - "Caught InvalidConnection exception while connecting external receptacle."); + "Caught InvalidConnection exception while connecting external receptacle."); } catch (const ::Components::AlreadyConnected& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::AlreadyConnected exception\n")); throw ::Deployment::InvalidConnection("", - "Caught AlreadyConnected exception while connecting external receptacle."); + "Caught AlreadyConnected exception while connecting external receptacle."); } catch (const ::Components::ExceededConnectionLimit& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect() returned ::Components::ExceededConnectionLimit exception\n")); throw ::Deployment::InvalidConnection("", - "Caught ExceededConnectionLimit while connecting external receptacle."); + "Caught ExceededConnectionLimit while connecting external receptacle."); } return res; } @@ -2022,21 +2022,21 @@ NodeApplication_Impl::connect_emitter (Components::CCMObject_ptr inst, DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect_consumer() returned ::Components::InvalidName exception\n")); throw ::Deployment::StartError("", - "Caught InvalidName while connecting emitter."); + "Caught InvalidName while connecting emitter."); } catch (const ::Components::AlreadyConnected& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect_consumer() returned ::Components::AlreadyConnected exception\n")); throw ::Deployment::InvalidConnection("", - "Caught AlreadyConnected exception while connecting emitter"); + "Caught AlreadyConnected exception while connecting emitter"); } catch (const ::Components::InvalidConnection& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect_consumer() returned ::Components::InvalidConnection exception\n")); throw ::Deployment::InvalidConnection("", - "Caught InvalidConnection while connecting emitter."); + "Caught InvalidConnection while connecting emitter."); } } @@ -2058,14 +2058,14 @@ NodeApplication_Impl::connect_emitter_ext (Components::CCMObject_ptr inst, DANCE_DEBUG ( (LM_WARNING, "NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect_consumer() returned ::Components::AlreadyConnected exception\n")); throw ::Deployment::InvalidConnection("", - "Caught AlreadyConnected exception while connecting external emitter."); + "Caught AlreadyConnected exception while connecting external emitter."); } catch (const ::Components::InvalidConnection& ) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " "Components::CCMObject_var::connect_consumer() returned ::Components::InvalidConnection exception\n")); throw ::Deployment::InvalidConnection("", - "Caught InvalidConnection exception while connecting external emitter."); + "Caught InvalidConnection exception while connecting external emitter."); } } @@ -2080,7 +2080,7 @@ NodeApplication_Impl::connect_publisher (Components::CCMObject_ptr inst, { DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::connect_publisher - " "Provided a nil CCMObject reference while connecting port %C\n", - port_name.c_str ())); + port_name.c_str ())); throw ::Deployment::InvalidConnection (); } Components::Cookie* res = 0; @@ -2089,7 +2089,7 @@ NodeApplication_Impl::connect_publisher (Components::CCMObject_ptr inst, { res = inst->subscribe (port_name.c_str(), event); DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - successfully subscribed %C\n", - port_name.c_str ())); + port_name.c_str ())); } catch (const ::Components::InvalidName& ) { diff --git a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h index 7a5c3d71272..b2e7bfee44c 100644 --- a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h +++ b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h @@ -2,7 +2,7 @@ //============================================================================= /** - * @file PlanLauncher.h + * @file Plan_Launcher.h * * $Id$ * diff --git a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp index 62041fce699..d1f6d0ce32b 100644 --- a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp +++ b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp @@ -25,7 +25,7 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc, { DANCE_DEBUG ((LM_INFO, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " "Creating internal ORB.\n")); - this->orb_ = CORBA::ORB_init (argc, argv, ""); + this->orb_ = CORBA::ORB_init (argc, argv); } this->parse_args(argc, argv); diff --git a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h index 8a359eeb72d..5e6f5e60cc6 100644 --- a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h +++ b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h @@ -1,6 +1,6 @@ /** * $Id$ - * @file Plan_Launcher_Impl.h + * @file Plan_Launcher_Base_Impl.h * @author Will Otte <wotte@dre.vanderbilt.edu> * * Contains the Plan_Launcher_i class, which can be used by diff --git a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h index 32e8170d5e9..308ae3c3c00 100644 --- a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h +++ b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h @@ -2,7 +2,7 @@ //============================================================================= /** - * @file Plan_Launcher_Module.h + * @file Plan_Launcher_Base_Module.h * * $Id$ * diff --git a/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp b/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp index 731033d635d..63487b08874 100644 --- a/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp +++ b/flat/CIAO/DAnCE/RedirectionService/CCMObjectLocator.cpp @@ -24,7 +24,7 @@ namespace DAnCE , mgr.in() , policies); DANCE_DEBUG ( (LM_DEBUG, "[%M] CCMObjectLocator::CCMObjectLocator - after create_POA\n")); - for (CORBA::ULong i = 0; i < policies.length(); ++i) + for (CORBA::ULong i = 0; i < policies.length(); ++i) { policies[i]->destroy(); } diff --git a/flat/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/flat/CIAO/DAnCE/RepositoryManager/RMadmin.cpp index 645d073ef59..c3dcfa97e0f 100644 --- a/flat/CIAO/DAnCE/RepositoryManager/RMadmin.cpp +++ b/flat/CIAO/DAnCE/RepositoryManager/RMadmin.cpp @@ -42,8 +42,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); Options* options = TheOptions::instance (); @@ -189,7 +188,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { //CHANGE(vt){ //CIAO::Config_Handlers::Packaging::PCD_Handler::package_config ("default.pcd", *pc); - throw (int)1; + throw 1; //} } catch (...) diff --git a/flat/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/flat/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp index ad5e230aa07..0ee8090ac74 100644 --- a/flat/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp +++ b/flat/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp @@ -919,7 +919,6 @@ CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_descriptors (const char* pc_nam { //CHANGE(vt){ //CIAO::Config_Handlers::Packaging::PCD_Handler::package_config (pc_name, *pc); - throw (int)1; //} } catch (...) diff --git a/flat/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/flat/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp index b53adc1e54f..1d1fe88031f 100644 --- a/flat/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp +++ b/flat/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp @@ -44,8 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + argv); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:")); int c; diff --git a/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp b/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp index cef28ead45e..f464bf5058f 100644 --- a/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp +++ b/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp @@ -12,7 +12,6 @@ namespace DAnCE const char *node_name, const char *impl_name, const char *ns_name) - throw (ImplementationNotFound) { // Modifying the deployment plan in order to include the new instance ... ::Deployment::InstanceDeploymentDescriptions instance = @@ -52,7 +51,6 @@ namespace DAnCE /* void DAnCE_Utils::add_connection (::Deployment::DeploymentPlan_var &deployment_plan, const char *connection_name, const char *port_name, const char *facet_instance, const char *receptacle_instance) - throw (InstanceNotFound) { // Modifying the deployment plan in order to include the new connection ... @@ -105,7 +103,6 @@ namespace DAnCE void DAnCE_Utils::remove_instance (::Deployment::DeploymentPlan_var &deployment_plan, const char *instance_name) - throw (InstanceNotFound) { // Modifying the deployment plan in order to remove the instance ... @@ -178,7 +175,6 @@ namespace DAnCE DAnCE_Utils::remove_connection ( ::Deployment::DeploymentPlan_var &deployment_plan, const char *connection_name) - throw (ConnectionNotFound) { ::Deployment::PlanConnectionDescriptions connection = deployment_plan->connection; diff --git a/flat/CIAO/DAnCE/Utils/Plan_Handler.h b/flat/CIAO/DAnCE/Utils/Plan_Handler.h index 300631745a4..f65e976ed19 100644 --- a/flat/CIAO/DAnCE/Utils/Plan_Handler.h +++ b/flat/CIAO/DAnCE/Utils/Plan_Handler.h @@ -46,26 +46,22 @@ namespace DAnCE const char *instance_name, const char *node_name, const char *impl_name, - const char *ns_name = 0) - throw (ImplementationNotFound); + const char *ns_name = 0); static void add_connection ( ::Deployment::DeploymentPlan &deployment_plan, const char *connection_name, const char *port_name, const char *facet_instance, - const char *receptacle_instance) - throw (InstanceNotFound); + const char *receptacle_instance); static void remove_instance ( ::Deployment::DeploymentPlan &deployment_plan, - const char *instance_name) - throw (InstanceNotFound); + const char *instance_name); static void remove_connection ( ::Deployment::DeploymentPlan &deployment_plan, - const char *connection_name) - throw (ConnectionNotFound); + const char *connection_name); static void print_instances ( const ::Deployment::DeploymentPlan &deployment_plan); diff --git a/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp index aa9064211c9..accb8f8f949 100644 --- a/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp +++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp @@ -77,7 +77,7 @@ namespace CIDL_SimpleUser_Impl { CIAO_ERROR ((LM_ERROR, "SimpleUser_exec_i::ccm_activate () - " "Error: Reference nil for port trig\n")); - return; + return; } // Your code here. diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp index 5ca73df524c..be325f6d09a 100644 --- a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp +++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp @@ -1,5 +1,5 @@ /** - * @file simple_nm_launcher.cpp + * @file simple_em_launcher.cpp * @author William R. Otte <wotte@dre.vanderbilt.edu> * * Launches then immediately tears down a plan. diff --git a/flat/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp b/flat/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp index f8d720af8bc..66889771759 100644 --- a/flat/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp +++ b/flat/CIAO/DAnCE/tests/DeploymentPlanDump/test.cpp @@ -2,7 +2,7 @@ #include "tools/Config_Handlers/XML_File_Intf.h" #include "DAnCE/Logger/Log_Macros.h" -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, char * ACE_TCHAR[]) { try { diff --git a/flat/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp b/flat/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp index 2b1840b6bf1..0f89c40ea72 100644 --- a/flat/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp +++ b/flat/CIAO/DAnCE/tests/DeploymentPlanTestReferences/test.cpp @@ -3,7 +3,7 @@ #include "tools/Config_Handlers/XML_File_Intf.h" #include "DAnCE/Logger/Log_Macros.h" -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { try { diff --git a/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp b/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp index 26515951abb..aaccef082fc 100644 --- a/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp +++ b/flat/CIAO/DAnCE/tests/DeploymentTest1/test.cpp @@ -9,7 +9,7 @@ #include "tools/Config_Handlers/DnC_Dump.h" #include "tools/Config_Handlers/XML_File_Intf.h" -int main (int argc, ACE_TCHAR * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { try { diff --git a/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp b/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp index c347f5fc388..dbe6117c2be 100644 --- a/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp +++ b/flat/CIAO/DAnCE/tests/MocksTest/MocksTest.cpp @@ -2,7 +2,7 @@ #include "Mocks/ComponentServer_Impl.h" #include "tao/ORB.h" -int main(int argc, ACE_TCHAR* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp b/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp index 789e4ab4409..74794ce420b 100644 --- a/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp +++ b/flat/CIAO/DAnCE/tests/NameServiceTest/srv_main.cpp @@ -9,7 +9,7 @@ using namespace NameServiceTest; -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { try { diff --git a/flat/CIAO/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp b/flat/CIAO/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp index f8f048ccc7c..c26ee9ea7a1 100644 --- a/flat/CIAO/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp +++ b/flat/CIAO/DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp @@ -2,7 +2,7 @@ #include "DAnCE/Deployment/Deployment_NodeApplicationC.h" #include "DAnCE/Logger/Log_Macros.h" -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, char * ACE_TCHAR[]) { try { diff --git a/flat/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp b/flat/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp index ec12b26e157..2b60ad8bb9a 100644 --- a/flat/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp +++ b/flat/CIAO/DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp @@ -1,7 +1,7 @@ #include "DAnCE/Deployment/Deployment_NodeManagerC.h" #include "DAnCE/Logger/Log_Macros.h" -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { try { diff --git a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/Dummy.idl b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/Dummy.idl index f7f107c9c0e..b91938cb4df 100644 --- a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/Dummy.idl +++ b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/Dummy.idl @@ -1,12 +1,12 @@ - +// $Id$ #ifndef DUMMY_IDL #define DUMMY_IDL module ObjectLocatorTest { - interface Dummy { - string sayHello(); - }; + interface Dummy { + string sayHello(); + }; }; #endif /* DUMMY_IDL */ diff --git a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/clt_main.cpp b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/clt_main.cpp index 20db7b6a96a..361d70dbc00 100644 --- a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/clt_main.cpp +++ b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/clt_main.cpp @@ -7,7 +7,7 @@ using namespace ObjectLocatorTest; -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { try { diff --git a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp index 4850a4de657..45086a67704 100644 --- a/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp +++ b/flat/CIAO/DAnCE/tests/ObjectLocatorTest/srv_main.cpp @@ -10,7 +10,7 @@ using namespace ObjectLocatorTest; -int main (int argc, ACE_TCHAR * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { try { diff --git a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/Dummy.idl b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/Dummy.idl index 5d0ccf25aa8..5925a4ceeba 100644 --- a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/Dummy.idl +++ b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/Dummy.idl @@ -1,12 +1,12 @@ - +// $Id$ #ifndef DUMMY_IDL #define DUMMY_IDL module Test { - interface Dummy { - string sayHello(); - }; + interface Dummy { + string sayHello(); + }; }; #endif /* DUMMY_IDL */ diff --git a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/clt_main.cpp b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/clt_main.cpp index 35f35c110f7..af42d33e8f1 100644 --- a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/clt_main.cpp +++ b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/clt_main.cpp @@ -90,7 +90,7 @@ bool test (const ACE_CString& url) }; -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { orb = CORBA::ORB_init (argc, argv); diff --git a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp index c4d53236506..1158a27e6b1 100644 --- a/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp +++ b/flat/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp @@ -10,7 +10,7 @@ using namespace Test; -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { // try { diff --git a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl index 78b8d77a2b9..84a51c4e697 100644 --- a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl +++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl @@ -23,7 +23,7 @@ module Components Container create_container(in ConfigValues config) raises (::Components::CreateFailure, - ::Components::Deployment::InvalidConfiguration); + ::Components::Deployment::InvalidConfiguration); void remove_container(in Container cref) raises (::Components::RemoveFailure); @@ -43,10 +43,10 @@ module Components CCMHome install_home(in UUID id, in string entrypt, in ConfigValues config) - raises (::Components::Deployment::UnknownImplId, - ::Components::Deployment::ImplEntryPointNotFound, - ::Components::Deployment::InstallationFailure, - ::Components::Deployment::InvalidConfiguration); + raises (::Components::Deployment::UnknownImplId, + ::Components::Deployment::ImplEntryPointNotFound, + ::Components::Deployment::InstallationFailure, + ::Components::Deployment::InvalidConfiguration); void remove_home(in CCMHome href) raises (::Components::RemoveFailure); diff --git a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl index dceeeeac6e4..c44ce1b8796 100644 --- a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl +++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl @@ -1,6 +1,6 @@ /** - * @file ComponentServer_Base.idl - * + * @file CCM_ComponentServer_Base.idl + * $Id$ * Contains base types for all componenent server interfaces. * These interfaces are not part of the CCM standard. */ diff --git a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl index 58baafb189c..8d5b0b02abd 100644 --- a/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl +++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl @@ -1,6 +1,7 @@ /** - * @file ComponentServer_Client.idl + * @file CCM_ComponentServer_Client.idl * Client side objects hosted by the NodeApplication. + * $Id$ */ #ifndef COMPONENTSERVER_CLIENT_IDL_ @@ -33,7 +34,7 @@ module Components { ComponentServer create_component_server(in ConfigValues config) raises(::Components::CreateFailure, - ::Components::Deployment::InvalidConfiguration); + ::Components::Deployment::InvalidConfiguration); void remove_component_server(in ComponentServer server) raises(::Components::RemoveFailure); diff --git a/flat/CIAO/ciao/CIAO_FailureReasons.idl b/flat/CIAO/ciao/CIAO_FailureReasons.idl index 3b3d1c9f9c4..9a1edc5834f 100644 --- a/flat/CIAO/ciao/CIAO_FailureReasons.idl +++ b/flat/CIAO/ciao/CIAO_FailureReasons.idl @@ -1,7 +1,7 @@ /** * @file CIAO_FailureReasons.idl * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * $Id$ * Failure code definitions for CIAO. The VID is based on that of TAO, but * our failure reasons start at that base since this is a different namespace. */ diff --git a/flat/CIAO/ciao/Client_init.cpp b/flat/CIAO/ciao/Client_init.cpp index 8528cd1ad5f..4ac6e9d53da 100644 --- a/flat/CIAO/ciao/Client_init.cpp +++ b/flat/CIAO/ciao/Client_init.cpp @@ -39,34 +39,34 @@ namespace CIAO namespace Utility { void build_config_values_map (CONFIGVALUE_MAP &map, - const ::Components::ConfigValues &config) + const ::Components::ConfigValues &config) { CIAO_TRACE("CIAO::build_config_values_map"); map.unbind_all (); for (CORBA::ULong i = 0; i < config.length (); ++i) { - int retval = map.rebind (config[i]->name (), config[i]->value ()); + int retval = map.rebind (config[i]->name (), config[i]->value ()); - if (retval == 1) - { + if (retval == 1) + { CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Duplicate value for %C encountered, " - "old value overwritten.\n", - config[i]->name ())); - } - else if (retval == -1) - { + "old value overwritten.\n", + config[i]->name ())); + } + else if (retval == -1) + { CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Error binding value for %C, ignoring.\n", - config[i]->name ())); - } - CIAO_DEBUG ((LM_TRACE, CLINFO + config[i]->name ())); + } + CIAO_DEBUG ((LM_TRACE, CLINFO "build_config_values_map: Bound value for config value %C\n", - config[i]->name ())); + config[i]->name ())); } } void build_config_values_sequence (::Components::ConfigValues &config, - const CONFIGVALUE_MAP &map) + const CONFIGVALUE_MAP &map) { CIAO_TRACE ("CIAO::build_config_values_sequence"); @@ -75,14 +75,14 @@ namespace CIAO CORBA::ULong pos = 0; for (CONFIGVALUE_MAP::const_iterator i = map.begin (); - (i.advance ()) != 0; ++pos) - { - Components::ConfigValue_var newval; - ACE_NEW_THROW_EX (newval, - ConfigValue_impl (i->ext_id_.c_str (), i->int_id_), - CORBA::NO_MEMORY ()); - config[pos] = newval._retn (); - } + (i.advance ()) != 0; ++pos) + { + Components::ConfigValue_var newval; + ACE_NEW_THROW_EX (newval, + ConfigValue_impl (i->ext_id_.c_str (), i->int_id_), + CORBA::NO_MEMORY ()); + config[pos] = newval._retn (); + } } /* diff --git a/flat/CIAO/ciao/Client_init.h b/flat/CIAO/ciao/Client_init.h index 2ab00f01a54..d62ad6a0757 100644 --- a/flat/CIAO/ciao/Client_init.h +++ b/flat/CIAO/ciao/Client_init.h @@ -48,10 +48,10 @@ namespace CIAO namespace Utility { typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - CORBA::Any, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> CONFIGVALUE_MAP; + CORBA::Any, + ACE_Hash<ACE_CString>, + ACE_Equal_To<ACE_CString>, + ACE_Null_Mutex> CONFIGVALUE_MAP; void CIAO_CLIENT_Export build_config_values_map (CONFIGVALUE_MAP &map, const ::Components::ConfigValues &config); diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl b/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl index a8d30a796e3..e6ad7577de4 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl +++ b/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl @@ -1,7 +1,7 @@ /** * @file CIAO_CS_Client.idl * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * $Id$ * A couple CIAO-specific extensions to the component server client * interfaces. */ @@ -17,12 +17,12 @@ module CIAO { interface ServerActivator : ::Components::Deployment::ServerActivator { - /// Used by spawned component servers to notify the server - /// activator of their object reference and retrieve - /// configuration information. - void component_server_callback (in ::Components::Deployment::ComponentServer serverref, - in string server_UUID, - out ::Components::ConfigValues config); + /// Used by spawned component servers to notify the server + /// activator of their object reference and retrieve + /// configuration information. + void component_server_callback (in ::Components::Deployment::ComponentServer serverref, + in string server_UUID, + out ::Components::ConfigValues config); void configuration_complete (in string server_UUID); }; diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl index a0a5de6514a..22f2fc09ae9 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl @@ -1,7 +1,7 @@ /** * @file CIAO_ComponentServer.idl * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * $Id$ * A couple CIAO-specific extensions to the component server * interfaces. */ @@ -56,9 +56,9 @@ module CIAO /// with an explicit home, this operation will fail. void remove_component (in ::Components::CCMObject cref) raises (::Components::RemoveFailure); - + /// Returns a sequence of all homeless components. - ::Components::CCMObjectSeq get_components (); + ::Components::CCMObjectSeq get_components (); }; }; }; diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp index f15df2f15f2..7521f828288 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp @@ -11,7 +11,7 @@ namespace CIAO { CIAO_ComponentServer_i::CIAO_ComponentServer_i (const ACE_CString &uuid, CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa) + PortableServer::POA_ptr poa) : uuid_ (uuid), orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)), diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h index 63ed835a644..bf08fbbc7bb 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h @@ -1,5 +1,5 @@ /** - * @file CIAO_ComponentServer.h + * @file CIAO_ComponentServer_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> */ diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp index 43aee0428de..e555bac7337 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp +++ b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp @@ -13,15 +13,15 @@ namespace CIAO { // Constructor CIAO_Container_i::CIAO_Container_i (const Components::ConfigValues &config, - const Static_Config_EntryPoints_Maps *static_entrypts, - const char *name, - const CORBA::PolicyList *policies, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa) + const Static_Config_EntryPoints_Maps *static_entrypts, + const char *name, + const CORBA::PolicyList *policies, + CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa) : orb_ (CORBA::ORB::_duplicate (orb)), - poa_ (PortableServer::POA::_duplicate (poa)), - config_ (config.length ()), - static_entrypts_maps_ (static_entrypts) + poa_ (PortableServer::POA::_duplicate (poa)), + config_ (config.length ()), + static_entrypts_maps_ (static_entrypts) { CIAO_TRACE("CIAO_Container_i::CIAO_Container_i"); @@ -69,11 +69,11 @@ namespace CIAO CIAO_TRACE("CIAO_Container_i::install_component"); if (id == 0) - { - CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_component - " + { + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_component - " "No home ID provided\n")); - throw ::Components::Deployment::InvalidConfiguration (); - } + throw ::Components::Deployment::InvalidConfiguration (); + } Components::CCMObject_var comp; @@ -86,20 +86,20 @@ namespace CIAO } if (entrypt == 0) - { - CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_component - " - "No executor entrypoint found.\n")); - throw ::Components::Deployment::InvalidConfiguration (); - } + { + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_component - " + "No executor entrypoint found.\n")); + throw ::Components::Deployment::InvalidConfiguration (); + } CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_Container_i::install_component - " "Attempting to install home with id [%C]\n", id)); CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_Container_i::install_component - " - "Extracting ConfigValues from sequence of length [%u]\n", - config.length ())); + "CIAO_Container_i::install_component - " + "Extracting ConfigValues from sequence of length [%u]\n", + config.length ())); CIAO::Utility::CONFIGVALUE_MAP cm; CIAO::Utility::build_config_values_map (cm, config); @@ -157,8 +157,8 @@ namespace CIAO } CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_Container_i::install_component - " - "Extraction resulted in map of [%u] values", cm.current_size ())); + "CIAO_Container_i::install_component - " + "Extraction resulted in map of [%u] values", cm.current_size ())); comp = this->container_->install_component (exec_art, entrypt, @@ -217,11 +217,11 @@ namespace CIAO CIAO_TRACE("CIAO_Container_i::install_home"); if (id == 0) - { - CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " - "No home ID provided\n")); - throw ::Components::Deployment::InvalidConfiguration (); - } + { + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " + "No home ID provided\n")); + throw ::Components::Deployment::InvalidConfiguration (); + } Components::CCMHome_var home; @@ -234,20 +234,20 @@ namespace CIAO } if (entrypt == 0) - { - CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " - "No executor entrypoint found.\n")); - throw ::Components::Deployment::InvalidConfiguration (); - } + { + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " + "No executor entrypoint found.\n")); + throw ::Components::Deployment::InvalidConfiguration (); + } CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_Container_i::install_home - " "Attempting to install home with id [%C]\n", - id)); + id)); CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_Container_i::install_home - " - "Extracting ConfigValues from sequence of length [%u]\n", - config.length ())); + "CIAO_Container_i::install_home - " + "Extracting ConfigValues from sequence of length [%u]\n", + config.length ())); CIAO::Utility::CONFIGVALUE_MAP cm; CIAO::Utility::build_config_values_map (cm, config); @@ -304,8 +304,8 @@ namespace CIAO } CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_Container_i::install_home - " - "Extraction resulted in map of [%u] values", cm.current_size ())); + "CIAO_Container_i::install_home - " + "Extraction resulted in map of [%u] values", cm.current_size ())); // extract config values here... diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h index 85b6576ad89..3f85cc731ff 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h +++ b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h @@ -1,5 +1,5 @@ /** - * @file CIAO_Container.h + * @file CIAO_Container_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> */ @@ -51,11 +51,11 @@ namespace CIAO virtual ::Components::ConfigValues * configuration (void); virtual - ::Components::Deployment::ComponentServer_ptr get_component_server (void); + ::Components::Deployment::ComponentServer_ptr get_component_server (void); virtual ::Components::CCMHome_ptr install_home (const char * id, - const char * entrypt, - const ::Components::ConfigValues & config); + const char * entrypt, + const ::Components::ConfigValues & config); virtual void remove_home (::Components::CCMHome_ptr href); diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_Properties.idl b/flat/CIAO/ciao/ComponentServer/CIAO_Properties.idl index d77b5c8b09b..41a3398a18a 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_Properties.idl +++ b/flat/CIAO/ciao/ComponentServer/CIAO_Properties.idl @@ -1,7 +1,7 @@ /** * @file CIAO_Properties.idl * @author William R. Otte - * + * $Id$ * Standardizes names of configvalues used by CIAO. */ @@ -25,4 +25,4 @@ module CIAO }; }; -#endif /* CIAO_PROPERTIES_IDL */
\ No newline at end of file +#endif /* CIAO_PROPERTIES_IDL */ diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h b/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h index 530ccb35657..8eb539e88cd 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h @@ -1,5 +1,5 @@ /** - * @file CIAO_ServerActivator.h + * @file CIAO_ServerActivator_Impl.h * @author William R. Otte */ diff --git a/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp b/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp index a9fc8f534a2..97f395947d4 100755 --- a/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp +++ b/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp @@ -38,90 +38,90 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG,"Basic_Config_Manager::init_resources\n")); if (CORBA::is_nil (this->orb_.in())) - { - CIAO_ERROR ((LM_ERROR, - "Basic_Config_Manager has not been properly initialized\n")); - throw CORBA::INTERNAL (); - } + { + CIAO_ERROR ((LM_ERROR, + "Basic_Config_Manager has not been properly initialized\n")); + throw CORBA::INTERNAL (); + } const PolicySets &sets = server_resource.orb_config.policy_set; for (CORBA::ULong i = 0; i < sets.length (); ++i) - { - CORBA::ULong np = sets[i].policies.length (); - if (np == 0) - continue; - - CORBA::PolicyList_var policy_list = new CORBA::PolicyList (np); - policy_list->length (np); - CORBA::ULong index = 0; - CORBA::ULong array_index = np; - - // Create a list of policies - for (CORBA::ULong pc = 0; pc < np; ++pc) - { - CORBA::Policy_var temp_policy = - this->create_single_policy (sets[i].policies[pc]); - - if (CORBA::is_nil (temp_policy.in ())) - { - array_index = array_index - 1; - policy_list->length (array_index); - } - else - { - policy_list[index] = temp_policy; - index = index + 1; - } - } - - // Bind the policy list to the name. The bind operation should - // surrender the ownership of the newly created PolicyList - // sequence to the map. - if (array_index != 0) - { - if (this->policy_map_.bind (sets[i].Id.in (), - policy_list) != 0) - { - CIAO_ERROR ((LM_ERROR, + { + CORBA::ULong np = sets[i].policies.length (); + if (np == 0) + continue; + + CORBA::PolicyList_var policy_list = new CORBA::PolicyList (np); + policy_list->length (np); + CORBA::ULong index = 0; + CORBA::ULong array_index = np; + + // Create a list of policies + for (CORBA::ULong pc = 0; pc < np; ++pc) + { + CORBA::Policy_var temp_policy = + this->create_single_policy (sets[i].policies[pc]); + + if (CORBA::is_nil (temp_policy.in ())) + { + array_index = array_index - 1; + policy_list->length (array_index); + } + else + { + policy_list[index] = temp_policy; + index = index + 1; + } + } + + // Bind the policy list to the name. The bind operation should + // surrender the ownership of the newly created PolicyList + // sequence to the map. + if (array_index != 0) + { + if (this->policy_map_.bind (sets[i].Id.in (), + policy_list) != 0) + { + CIAO_ERROR ((LM_ERROR, "Error binding Policy_Set with name: %C\n", - sets[i].Id.in ())); - throw CORBA::INTERNAL (); - } - else - { - CIAO_DEBUG ((LM_DEBUG, - "Basic_Config_Manager::init_resource" + sets[i].Id.in ())); + throw CORBA::INTERNAL (); + } + else + { + CIAO_DEBUG ((LM_DEBUG, + "Basic_Config_Manager::init_resource" " added policy set : %C with %d policies\n", - sets[i].Id.in (), array_index)); - } - } - else - { - CIAO_DEBUG ((LM_DEBUG, - "Basic_Config_Manager::init_resource" + sets[i].Id.in (), array_index)); + } + } + else + { + CIAO_DEBUG ((LM_DEBUG, + "Basic_Config_Manager::init_resource" " added policy set : %C with %d policies\n", - sets[i].Id.in (), array_index)); - } - } + sets[i].Id.in (), array_index)); + } + } } bool Basic_Config_Manager::policy_exists (const char *name) { if (name == 0) - { - CIAO_ERROR ((LM_ERROR, - "Invalid name string found in " - "Basic_Config_Manager::policy_exists\n")); - throw CORBA::INTERNAL (); - } + { + CIAO_ERROR ((LM_ERROR, + "Invalid name string found in " + "Basic_Config_Manager::policy_exists\n")); + throw CORBA::INTERNAL (); + } POLICY_MAP::ENTRY *entry = 0; if (this->policy_map_.find (name, entry) != 0) - { - return false; - } + { + return false; + } return true; } @@ -130,27 +130,27 @@ namespace CIAO Basic_Config_Manager::find_policies_by_name (const char *name) { if (name == 0) - { - CIAO_DEBUG ((LM_DEBUG, - "Invalid name string found in find_policies_by_name\n")); - throw CORBA::INTERNAL (); - } + { + CIAO_DEBUG ((LM_DEBUG, + "Invalid name string found in find_policies_by_name\n")); + throw CORBA::INTERNAL (); + } POLICY_MAP::ENTRY *entry = 0; CORBA::PolicyList_var retv; if (this->policy_map_.find (name, entry) != 0) - { - CIAO_DEBUG ((LM_DEBUG, + { + CIAO_DEBUG ((LM_DEBUG, "Unable to find a PolicyList named %C\n", - name)); - retv = 0; - } + name)); + retv = 0; + } else - { - retv = new CORBA::PolicyList (entry->int_id_.in ()); - } + { + retv = new CORBA::PolicyList (entry->int_id_.in ()); + } return retv._retn (); } @@ -161,60 +161,60 @@ namespace CIAO CORBA::Policy_var retv; switch (policy_def._d ()) - { - case TAO::NETWORK_PRIORITY_TYPE: - { - const NWPriorityModelPolicyDef &nw_tmp - = policy_def.NWPriorityModelDef (); - retv = this->orb_->_create_policy (TAO::NETWORK_PRIORITY_TYPE); + { + case TAO::NETWORK_PRIORITY_TYPE: + { + const NWPriorityModelPolicyDef &nw_tmp + = policy_def.NWPriorityModelDef (); + retv = this->orb_->_create_policy (TAO::NETWORK_PRIORITY_TYPE); - TAO::NetworkPriorityPolicy_var nw_priority = - TAO::NetworkPriorityPolicy::_narrow (retv.in ()); + TAO::NetworkPriorityPolicy_var nw_priority = + TAO::NetworkPriorityPolicy::_narrow (retv.in ()); - nw_priority->network_priority_model ( - (TAO::NetworkPriorityModel) nw_tmp.nw_priority_model); + nw_priority->network_priority_model ( + (TAO::NetworkPriorityModel) nw_tmp.nw_priority_model); - nw_priority->request_diffserv_codepoint ( - (TAO::DiffservCodepoint) nw_tmp.request_dscp); + nw_priority->request_diffserv_codepoint ( + (TAO::DiffservCodepoint) nw_tmp.request_dscp); - nw_priority->reply_diffserv_codepoint ( - (TAO::DiffservCodepoint) nw_tmp.reply_dscp); + nw_priority->reply_diffserv_codepoint ( + (TAO::DiffservCodepoint) nw_tmp.reply_dscp); - retv = nw_priority._retn (); + retv = nw_priority._retn (); - if (! CORBA::is_nil (retv.in ())) - CIAO_DEBUG ((LM_DEBUG, - "NAConfigManager::Create NetworkPriority policy: %d\n", - nw_tmp.nw_priority_model)); - } - break; + if (! CORBA::is_nil (retv.in ())) + CIAO_DEBUG ((LM_DEBUG, + "NAConfigManager::Create NetworkPriority policy: %d\n", + nw_tmp.nw_priority_model)); + } + break; - case TAO::CLIENT_NETWORK_PRIORITY_TYPE: - { - const CNWPriorityModelPolicyDef &cnw_tmp - = policy_def.CNWPriorityModelDef (); - retv = this->orb_->_create_policy (TAO::CLIENT_NETWORK_PRIORITY_TYPE); + case TAO::CLIENT_NETWORK_PRIORITY_TYPE: + { + const CNWPriorityModelPolicyDef &cnw_tmp + = policy_def.CNWPriorityModelDef (); + retv = this->orb_->_create_policy (TAO::CLIENT_NETWORK_PRIORITY_TYPE); - TAO::NetworkPriorityPolicy_var cnw_priority = - TAO::NetworkPriorityPolicy::_narrow (retv.in ()); + TAO::NetworkPriorityPolicy_var cnw_priority = + TAO::NetworkPriorityPolicy::_narrow (retv.in ()); - cnw_priority->request_diffserv_codepoint ( - (TAO::DiffservCodepoint) cnw_tmp.request_dscp); + cnw_priority->request_diffserv_codepoint ( + (TAO::DiffservCodepoint) cnw_tmp.request_dscp); - cnw_priority->reply_diffserv_codepoint ( - (TAO::DiffservCodepoint) cnw_tmp.reply_dscp); + cnw_priority->reply_diffserv_codepoint ( + (TAO::DiffservCodepoint) cnw_tmp.reply_dscp); - retv = cnw_priority._retn (); + retv = cnw_priority._retn (); - if (! CORBA::is_nil (retv.in ())) - CIAO_DEBUG ((LM_DEBUG, - "NAConfigManager::Create NetworkPriority policy \n")); - } - break; + if (! CORBA::is_nil (retv.in ())) + CIAO_DEBUG ((LM_DEBUG, + "NAConfigManager::Create NetworkPriority policy \n")); + } + break; - default: - retv = 0; - } + default: + retv = 0; + } return retv._retn (); } diff --git a/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h b/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h index 0f1f0b03b64..e599cc7eb04 100755 --- a/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h +++ b/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.h @@ -12,7 +12,7 @@ #ifndef CIAO_NACONFIG_MANAGER_H #define CIAO_NACONFIG_MANAGER_H -#include /**/ <ace/pre.h> +#include /**/ "ace/pre.h" #include "ace/config-all.h" @@ -59,14 +59,14 @@ namespace CIAO CORBA::ORB_var orb_; CORBA::Policy_ptr create_single_policy - (const PolicyDef &policy_def); + (const PolicyDef &policy_def); /// Hash_Map stuff. typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - CORBA::PolicyList_var, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> POLICY_MAP; + CORBA::PolicyList_var, + ACE_Hash<ACE_CString>, + ACE_Equal_To<ACE_CString>, + ACE_Null_Mutex> POLICY_MAP; /// Internal TP names to id map. POLICY_MAP policy_map_; diff --git a/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h b/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h index fbbea84d706..071536a5fc6 100644 --- a/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h +++ b/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.h @@ -95,16 +95,16 @@ namespace CIAO /// Hash_Map stuff. typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - RTCORBA::ThreadpoolId, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> TP_MAP; + RTCORBA::ThreadpoolId, + ACE_Hash<ACE_CString>, + ACE_Equal_To<ACE_CString>, + ACE_Null_Mutex> TP_MAP; typedef ACE_Hash_Map_Manager_Ex<ACE_CString, - RTCORBA::PriorityBands_var, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex> PB_MAP; + RTCORBA::PriorityBands_var, + ACE_Hash<ACE_CString>, + ACE_Equal_To<ACE_CString>, + ACE_Null_Mutex> PB_MAP; /// Internal TP name to id map. TP_MAP threadpool_map_; diff --git a/flat/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h b/flat/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h index 4a8074b083d..0943afb71ac 100644 --- a/flat/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h +++ b/flat/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h @@ -1,7 +1,7 @@ //$Id$ /**======================================================== * - * @file ComponentServer_Configurator.h + * @file Server_Configurator.h * * @Brief This file contains the implementation of * the basic ComponentServer_Configurator interface, the one diff --git a/flat/CIAO/ciao/Containers/CIAO_Servant_Activator.idl b/flat/CIAO/ciao/Containers/CIAO_Servant_Activator.idl index 35bb2d0cc83..18aa906e0e2 100644 --- a/flat/CIAO/ciao/Containers/CIAO_Servant_Activator.idl +++ b/flat/CIAO/ciao/Containers/CIAO_Servant_Activator.idl @@ -1,7 +1,7 @@ /** - * @file CIAO_Servant_Activator.h + * @file CIAO_Servant_Activator.idl * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * $Id$ * Local interface extensions for the CIAO servant activator. */ diff --git a/flat/CIAO/ciao/Containers/Container_Base.idl b/flat/CIAO/ciao/Containers/Container_Base.idl index 85d7b12d722..01a79b71a15 100644 --- a/flat/CIAO/ciao/Containers/Container_Base.idl +++ b/flat/CIAO/ciao/Containers/Container_Base.idl @@ -1,7 +1,7 @@ /** * @file Container_Base.idl * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * $Id$ * Container local interface. */ diff --git a/flat/CIAO/ciao/Containers/Servant_Activator.cpp b/flat/CIAO/ciao/Containers/Servant_Activator.cpp index 3f2549bffe0..8f2355a6bbd 100644 --- a/flat/CIAO/ciao/Containers/Servant_Activator.cpp +++ b/flat/CIAO/ciao/Containers/Servant_Activator.cpp @@ -23,8 +23,8 @@ namespace CIAO /* _var should take care of this now. { ACE_GUARD (TAO_SYNCH_MUTEX, - guard, - this->mutex_); + guard, + this->mutex_); size_t const sz = this->slot_index_; @@ -48,9 +48,9 @@ namespace CIAO PortableServer::ObjectId_to_string (oid); { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->mutex_, - CORBA::NO_RESOURCES ()); + guard, + this->mutex_, + CORBA::NO_RESOURCES ()); size_t const sz = this->slot_index_; for (size_t t = 0; t != sz; ++t) @@ -83,9 +83,9 @@ namespace CIAO { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - guard, - this->mutex_, - CORBA::NO_RESOURCES ()); + guard, + this->mutex_, + CORBA::NO_RESOURCES ()); size_t const sz = this->slot_index_; Port_Activator_var tmp; @@ -183,13 +183,13 @@ namespace CIAO { ++this->slot_index_; - CIAO_DEBUG ((LM_INFO, CLINFO - "Servant_Activator_i::" - "register_port_activator" + CIAO_DEBUG ((LM_INFO, CLINFO + "Servant_Activator_i::" + "register_port_activator" " with port name [%C]," - " the slot_index_ is [%d] \n", - pa->name (), - this->slot_index_)); + " the slot_index_ is [%d] \n", + pa->name (), + this->slot_index_)); return true; } diff --git a/flat/CIAO/ciao/Containers/Servant_Activator.h b/flat/CIAO/ciao/Containers/Servant_Activator.h index 997355b8223..19eca30ae49 100644 --- a/flat/CIAO/ciao/Containers/Servant_Activator.h +++ b/flat/CIAO/ciao/Containers/Servant_Activator.h @@ -74,10 +74,10 @@ namespace CIAO PortableServer::POA_ptr poa); virtual void etherealize (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr adapter, - PortableServer::Servant servant, - CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations); + PortableServer::POA_ptr adapter, + PortableServer::Servant servant, + CORBA::Boolean cleanup_in_progress, + CORBA::Boolean remaining_activations); /// Local helper methods private: diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp index 99ff4d8fb79..6867fd1c8b4 100644 --- a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -24,8 +24,8 @@ namespace CIAO Deployment::CIAO_Container_i *container_impl, bool static_config_flag, const Static_Config_EntryPoints_Maps* maps, - const char *name, - const CORBA::PolicyList *more_policies) + const char *name, + const CORBA::PolicyList *more_policies) : Container_i (o, container_impl), number_ (0), static_config_flag_ (static_config_flag), @@ -85,7 +85,7 @@ namespace CIAO if (CORBA::is_nil (poa_object.in ())) { CIAO_ERROR ((LM_ERROR, CLINFO - "CIAO::Session_Container: Unable to initialize the POA.\n")); + "CIAO::Session_Container: Unable to initialize the POA.\n")); throw Components::CreateFailure (); } @@ -242,7 +242,7 @@ namespace CIAO servant_artifact, servant_entrypoint)); ACE_DLL executor_dll; - ACE_DLL servant_dll; + ACE_DLL servant_dll; if (primary_artifact == 0 || servant_artifact == 0) { @@ -386,9 +386,9 @@ namespace CIAO error += servant_artifact; } - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::ciao_install_home - Error:%C\n", - error.c_str ())); + error.c_str ())); throw Components::Deployment::ImplEntryPointNotFound (); } @@ -399,8 +399,8 @@ namespace CIAO if (CORBA::is_nil (home_executor.in ())) { - CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::Ciao_install_hoe - Home executor factory failed. \n")); + CIAO_ERROR ((LM_ERROR, CLINFO + "Session_Container::Ciao_install_hoe - Home executor factory failed. \n")); throw Components::Deployment::InstallationFailure (); } @@ -412,8 +412,8 @@ namespace CIAO if (home_servant == 0) { - CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_home - Home servant factory failed.\n")); + CIAO_ERROR ((LM_ERROR, CLINFO + "Session_Container::ciao_install_home - Home servant factory failed.\n")); throw Components::Deployment::InstallationFailure (); } @@ -607,9 +607,9 @@ namespace CIAO error += servant_artifact; } - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::ciao_install_component - Error:%C\n", - error.c_str ())); + error.c_str ())); throw Components::Deployment::ImplEntryPointNotFound (); } @@ -620,8 +620,8 @@ namespace CIAO if (CORBA::is_nil (component_executor.in ())) { - CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::Ciao_install_hoe - Component executor factory failed. \n")); + CIAO_ERROR ((LM_ERROR, CLINFO + "Session_Container::Ciao_install_hoe - Component executor factory failed. \n")); throw Components::Deployment::InstallationFailure (); } @@ -634,7 +634,7 @@ namespace CIAO if (component_servant == 0) { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_component - Component servant factory failed.\n")); + "Session_Container::ciao_install_component - Component servant factory failed.\n")); throw Components::Deployment::InstallationFailure (); } @@ -838,7 +838,7 @@ namespace CIAO void Session_Container::add_servant_to_map (PortableServer::ObjectId &, - Dynamic_Component_Servant_Base*) + Dynamic_Component_Servant_Base*) { CIAO_TRACE ("Session_Container::add_servant_to_map"); throw CORBA::NO_IMPLEMENT (); diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.h b/flat/CIAO/ciao/Containers/Session/Session_Container.h index 93e8a6dc57e..5fc0467bdfb 100644 --- a/flat/CIAO/ciao/Containers/Session/Session_Container.h +++ b/flat/CIAO/ciao/Containers/Session/Session_Container.h @@ -129,7 +129,7 @@ namespace CIAO const char *servant_entrypoint, const char *name); - /// Activate component + /// Activate component virtual void activate_component (Components::CCMObject_ptr compref); virtual void passivate_component (Components::CCMObject_ptr compref); diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.idl b/flat/CIAO/ciao/Containers/Session/Session_Container.idl index 7663a61bf15..65021db65c8 100644 --- a/flat/CIAO/ciao/Containers/Session/Session_Container.idl +++ b/flat/CIAO/ciao/Containers/Session/Session_Container.idl @@ -1,7 +1,7 @@ /** * @file Session_Container.idl * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * $Id$ * Extends the basic container interface for session capabilities. */ diff --git a/flat/CIAO/ciao/Contexts/Context.mpc b/flat/CIAO/ciao/Contexts/Context.mpc index e5618d4aec0..a016053c39c 100644 --- a/flat/CIAO/ciao/Contexts/Context.mpc +++ b/flat/CIAO/ciao/Contexts/Context.mpc @@ -1,3 +1,4 @@ +//$Id$ project(CIAO_Context_Impl) : ccm_svnt, ciao_container_base, portableserver { dynamicflags = CONTEXT_IMPL_BUILD_DLL Source_Files { diff --git a/flat/CIAO/ciao/Servants/CIAO_Port_Activator.idl b/flat/CIAO/ciao/Servants/CIAO_Port_Activator.idl index 51e46d5f766..593a9b33ce0 100644 --- a/flat/CIAO/ciao/Servants/CIAO_Port_Activator.idl +++ b/flat/CIAO/ciao/Servants/CIAO_Port_Activator.idl @@ -1,7 +1,7 @@ /** * @file CIAO_Port_Activator.idl * @author Wiliam R. Otte <wotte@dre.vanderbilt.edu - * + * $Id$ * Local interface describing servant activators for component ports. */ diff --git a/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h b/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h index 69d858b467d..f1c6de82b60 100644 --- a/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h +++ b/flat/CIAO/ciao/Servants/Home_Servant_Impl_Base.h @@ -24,8 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <ccm/CCM_HomeS.h> -#include <ciao/Containers/Container_BaseC.h> +#include "ccm/CCM_HomeS.h" +#include "ciao/Containers/Container_BaseC.h" namespace CIAO { diff --git a/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp index d62666350f1..3cb723724a7 100644 --- a/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp +++ b/flat/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp @@ -170,12 +170,12 @@ namespace CIAO typedef typename COMP_SVNT::_stub_type stub_type; COMP_SVNT *svt = 0; ACE_NEW_THROW_EX (svt, - COMP_SVNT (exe, - home.in (), - this->ins_name_, - this, - this->container_), - CORBA::NO_MEMORY ()); + COMP_SVNT (exe, + home.in (), + this->ins_name_, + this, + this->container_), + CORBA::NO_MEMORY ()); PortableServer::ServantBase_var safe (svt); PortableServer::ObjectId_var oid; diff --git a/flat/CIAO/ciao/Servants/Port_Activator.h b/flat/CIAO/ciao/Servants/Port_Activator.h index 9dc24241cb8..994ac418991 100644 --- a/flat/CIAO/ciao/Servants/Port_Activator.h +++ b/flat/CIAO/ciao/Servants/Port_Activator.h @@ -62,7 +62,7 @@ namespace CIAO virtual PortableServer::Servant activate ( const PortableServer::ObjectId &oid) = 0; - virtual void deactivate (::PortableServer::Servant servant) = 0; + virtual void deactivate (::PortableServer::Servant servant) = 0; protected: /// The object ID that is used to activate the servant within the diff --git a/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp index 5b055812cf4..c24d47438fb 100644 --- a/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp +++ b/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp @@ -108,7 +108,7 @@ namespace CIAO oid.out ()); if (this->home_servant_) - this->home_servant_->update_component_map (oid); + this->home_servant_->update_component_map (oid); } catch (const CORBA::Exception& ex) { @@ -129,8 +129,8 @@ namespace CIAO CIAO_TRACE("Servant_Impl_Base::get_all_ports (void)"); OBV_Components::ComponentPortDescription *cps = 0; ACE_NEW_THROW_EX (cps, - OBV_Components::ComponentPortDescription, - CORBA::NO_MEMORY ()); + OBV_Components::ComponentPortDescription, + CORBA::NO_MEMORY ()); ::Components::ComponentPortDescription_var retv = cps; ::Components::FacetDescriptions_var facets_desc = @@ -183,8 +183,8 @@ namespace CIAO CIAO_TRACE("Servant_Impl_Base::get_named_facets"); Components::FacetDescriptions *retval = 0; ACE_NEW_THROW_EX (retval, - ::Components::FacetDescriptions, - CORBA::NO_MEMORY ()); + ::Components::FacetDescriptions, + CORBA::NO_MEMORY ()); Components::FacetDescriptions_var safe_retval = retval; CORBA::ULong const len = names.length (); safe_retval->length (len); @@ -211,8 +211,8 @@ namespace CIAO CIAO_TRACE ("Servant_Impl_Base::get_all_facets (void)"); ::Components::FacetDescriptions *tmp = 0; ACE_NEW_THROW_EX (tmp, - ::Components::FacetDescriptions, - CORBA::NO_MEMORY ()); + ::Components::FacetDescriptions, + CORBA::NO_MEMORY ()); ::Components::FacetDescriptions_var retval = tmp; @@ -284,7 +284,7 @@ namespace CIAO Components::ConsumerDescriptions *retval = 0; ACE_NEW_THROW_EX (retval, ::Components::ConsumerDescriptions, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY ()); Components::ConsumerDescriptions_var safe_retval = retval; CORBA::ULong const len = names.length (); safe_retval->length (len); @@ -321,8 +321,8 @@ namespace CIAO ::Components::ReceptacleDescriptions *tmp = 0; ACE_NEW_THROW_EX (tmp, - ::Components::ReceptacleDescriptions, - CORBA::NO_MEMORY ()); + ::Components::ReceptacleDescriptions, + CORBA::NO_MEMORY ()); ::Components::ReceptacleDescriptions_var retval = tmp; @@ -379,10 +379,10 @@ namespace CIAO ::Components::FacetDescription *fd = 0; ACE_NEW_THROW_EX (fd, - ::OBV_Components::FacetDescription (port_name, - port_ref->_interface_repository_id (), - port_ref), - CORBA::NO_MEMORY ()); + ::OBV_Components::FacetDescription (port_name, + port_ref->_interface_repository_id (), + port_ref), + CORBA::NO_MEMORY ()); ::Components::FacetDescription_var safe = fd; FacetTable::value_type entry; @@ -391,7 +391,7 @@ namespace CIAO { ACE_WRITE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_, - CORBA::NO_RESOURCES ()); + CORBA::NO_RESOURCES ()); (void) this->facet_table_.insert (entry); } @@ -407,9 +407,9 @@ namespace CIAO } ACE_READ_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); + mon, + this->lock_, + CORBA::NO_RESOURCES ()); FacetTable::const_iterator iter = this->facet_table_.find (port_name); @@ -472,8 +472,8 @@ namespace CIAO receptacle_name)); ACE_NEW_THROW_EX (rd, - OBV_Components::ReceptacleDescription, - CORBA::NO_MEMORY ()); + OBV_Components::ReceptacleDescription, + CORBA::NO_MEMORY ()); safe = rd; rd->name (receptacle_name); @@ -484,9 +484,9 @@ namespace CIAO ::Components::ConnectionDescription *cd = 0; ACE_NEW_THROW_EX (cd, - OBV_Components::ConnectionDescription (cookie, - recept_ref), - CORBA::NO_MEMORY ()); + OBV_Components::ConnectionDescription (cookie, + recept_ref), + CORBA::NO_MEMORY ()); ::Components::ConnectionDescription_var cd_safe = cd; ::Components::ConnectionDescriptions cds (1); @@ -503,9 +503,9 @@ namespace CIAO ::Components::ConnectionDescription *cd = 0; ACE_NEW_THROW_EX (cd, - OBV_Components::ConnectionDescription (cookie, - recept_ref), - CORBA::NO_MEMORY ()); + OBV_Components::ConnectionDescription (cookie, + recept_ref), + CORBA::NO_MEMORY ()); ::Components::ConnectionDescription_var cd_safe = cd; ::Components::ConnectionDescriptions & cds = rd->connections (); CORBA::ULong old_length = cds.length (); @@ -528,21 +528,21 @@ namespace CIAO void Servant_Impl_Base::add_consumer (const char *port_name, - ::Components::EventConsumerBase_ptr port_ref) + ::Components::EventConsumerBase_ptr port_ref) { CIAO_TRACE("Servant_Impl_Base::add_consumer"); if (0 == port_name || ::CORBA::is_nil (port_ref)) { CIAO_ERROR ((LM_ERROR, CLINFO "Servant_Impl_Base::add_consumer - Bad port name [%C] or bad objref\n", - port_name)); + port_name)); throw ::CORBA::BAD_PARAM (); return; } ::Components::ConsumerDescription *cd = 0; ACE_NEW_THROW_EX (cd, - ::OBV_Components::ConsumerDescription, - CORBA::NO_MEMORY ()); + ::OBV_Components::ConsumerDescription, + CORBA::NO_MEMORY ()); ::Components::ConsumerDescription_var safe = cd; @@ -555,7 +555,7 @@ namespace CIAO entry.second = safe._retn (); ACE_WRITE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_, - CORBA::NO_RESOURCES ()); + CORBA::NO_RESOURCES ()); (void) this->consumer_table_.insert (entry); } @@ -570,9 +570,9 @@ namespace CIAO } ACE_READ_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); + mon, + this->lock_, + CORBA::NO_RESOURCES ()); ConsumerTable::const_iterator iter = this->consumer_table_.find (port_name); @@ -603,9 +603,9 @@ namespace CIAO { ACE_READ_GUARD_THROW_EX (TAO_SYNCH_MUTEX, - mon, - this->lock_, - CORBA::NO_RESOURCES ()); + mon, + this->lock_, + CORBA::NO_RESOURCES ()); iter = this->consumer_table_.find (port_name); diff --git a/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp b/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp index a4b03e1a239..ce20e0f2a7b 100644 --- a/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp +++ b/flat/CIAO/ciao/Servants/Servant_Impl_Utils_T.cpp @@ -22,8 +22,8 @@ namespace CIAO ::Components::ReceptacleDescription *elem = 0; ACE_NEW_THROW_EX (elem, - ::OBV_Components::ReceptacleDescription, - CORBA::NO_MEMORY ()); + ::OBV_Components::ReceptacleDescription, + CORBA::NO_MEMORY ()); ::Components::ReceptacleDescription_var safe_elem = elem; @@ -57,8 +57,8 @@ namespace CIAO ::Components::ReceptacleDescription *elem = 0; ACE_NEW_THROW_EX (elem, - ::OBV_Components::ReceptacleDescription, - CORBA::NO_MEMORY ()); + ::OBV_Components::ReceptacleDescription, + CORBA::NO_MEMORY ()); ::Components::ReceptacleDescription_var safe_elem = elem; @@ -78,14 +78,14 @@ namespace CIAO ++iter, ++seq_slot) { ACE_NEW_THROW_EX (conn, - ::OBV_Components::ConnectionDescription, - CORBA::NO_MEMORY ()); + ::OBV_Components::ConnectionDescription, + CORBA::NO_MEMORY ()); ::Components::ConnectionDescription_var safe_conn = conn; ::Components::Cookie *key_cookie = 0; ACE_NEW_THROW_EX (key_cookie, - CIAO::Cookie_Impl (iter->first), - CORBA::NO_MEMORY ()); + CIAO::Cookie_Impl (iter->first), + CORBA::NO_MEMORY ()); // Valuetype member set operation calls add_ref. conn->ck (key_cookie); @@ -113,8 +113,8 @@ namespace CIAO ::Components::PublisherDescription *elem = 0; ACE_NEW_THROW_EX (elem, - ::OBV_Components::PublisherDescription, - CORBA::NO_MEMORY ()); + ::OBV_Components::PublisherDescription, + CORBA::NO_MEMORY ()); ::Components::PublisherDescription_var safe_elem = elem; @@ -133,8 +133,8 @@ namespace CIAO ++iter, ++map_slot) { ACE_NEW_THROW_EX (sub, - ::OBV_Components::SubscriberDescription, - CORBA::NO_MEMORY ()); + ::OBV_Components::SubscriberDescription, + CORBA::NO_MEMORY ()); ::Components::SubscriberDescription_var safe_sub = sub; ::Components::Cookie *key_cookie = 0; @@ -165,8 +165,8 @@ namespace CIAO CIAO_TRACE ("Servant_Impl_Base::describe_emit_event_source"); ::Components::EmitterDescription *elem = 0; ACE_NEW_THROW_EX (elem, - ::OBV_Components::EmitterDescription, - CORBA::NO_MEMORY ()); + ::OBV_Components::EmitterDescription, + CORBA::NO_MEMORY ()); ::Components::EmitterDescription_var safe_elem = elem; elem->name (port_name); diff --git a/flat/CIAO/ciao/Server_init.cpp b/flat/CIAO/ciao/Server_init.cpp index b12c7fab7fb..3294c9ff9f8 100644 --- a/flat/CIAO/ciao/Server_init.cpp +++ b/flat/CIAO/ciao/Server_init.cpp @@ -42,27 +42,27 @@ namespace CIAO // Implementation of NameUtility class // -------------------------------------------------------------- bool NameUtility::bind_name (const char *namestr, - CORBA::Object_ptr obj, - CosNaming::NamingContextExt_var &root) + CORBA::Object_ptr obj, + CosNaming::NamingContextExt_var &root) { if (namestr == 0) - { - CIAO_ERROR ((LM_WARNING, CLINFO - "NameUtility::bind_name - " - "called with null name, aborting registration. \n")); - return false; - } + { + CIAO_ERROR ((LM_WARNING, CLINFO + "NameUtility::bind_name - " + "called with null name, aborting registration. \n")); + return false; + } CosNaming::Name name; NameUtility::create_name (namestr, name); if (name.length () > 1) - { - // This name has contexts, create them. - name.length (name.length () - 1); - Utility::NameUtility::create_context_path (root.in (), name); - name.length (name.length () + 1); - } + { + // This name has contexts, create them. + name.length (name.length () - 1); + Utility::NameUtility::create_context_path (root.in (), name); + name.length (name.length () + 1); + } return NameUtility::bind_object_path (root.in (), name, obj); } @@ -76,11 +76,11 @@ namespace CIAO tok.delimiter ('/'); for (char *p = tok.next (); p; p=tok.next ()) - { - CORBA::ULong pos = name.length (); - name.length (pos + 1); - name[pos].id = CORBA::string_dup (p); - } + { + CORBA::ULong pos = name.length (); + name.length (pos + 1); + name[pos].id = CORBA::string_dup (p); + } } void NameUtility::create_context_path (const CosNaming::NamingContextExt_ptr nc, @@ -96,17 +96,17 @@ namespace CIAO { tmpCtxVar = nc->bind_new_context (name); CIAO_DEBUG ((LM_TRACE, CLINFO - "NameUtility::CreateContextPath - Bound Context.\n\n")); + "NameUtility::CreateContextPath - Bound Context.\n\n")); } catch (const CosNaming::NamingContext::AlreadyBound&) { CIAO_DEBUG ((LM_TRACE, CLINFO - "NameUtility::CreateContextPath - Context Already Bound.\n\n")); + "NameUtility::CreateContextPath - Context Already Bound.\n\n")); } catch (const CosNaming::NamingContext::NotFound& nf) { CIAO_DEBUG ((LM_TRACE, CLINFO - "NameUtility::CreateContextPath - Context not found.\n\n")); + "NameUtility::CreateContextPath - Context not found.\n\n")); isNotFound = true; lengthMissing = nf.rest_of_name.length (); } @@ -114,7 +114,7 @@ namespace CIAO if (lengthMissing == name.length ()) { CIAO_ERROR ((LM_ERROR, CLINFO - "NameUtility::CreateContextPath - Null name length.\n\n")); + "NameUtility::CreateContextPath - Null name length.\n\n")); } if (isNotFound) @@ -137,7 +137,7 @@ namespace CIAO tmpCtxVar = nc->bind_new_context (tmpName); CIAO_DEBUG ((LM_TRACE, CLINFO - "NameUtility::CreateContextPath - Bound New Context.\n")); + "NameUtility::CreateContextPath - Bound New Context.\n")); } } } @@ -160,7 +160,7 @@ namespace CIAO catch (const CosNaming::NamingContext::NotFound&) { CIAO_DEBUG ((LM_TRACE, CLINFO - "NameUtility::BindObjectPath - Name not found, doing new bind.\n")); + "NameUtility::BindObjectPath - Name not found, doing new bind.\n")); nc->bind (name, obj); } catch (...) @@ -197,7 +197,7 @@ namespace CIAO if (CORBA::is_nil (tmpContextV.in ())) { CIAO_ERROR ((LM_ERROR, CLINFO - "NameUtility::listBindings: Nil context.\n")); + "NameUtility::listBindings: Nil context.\n")); return 0; } diff --git a/flat/CIAO/ciao/Valuetype_Factories/Factories.mpc b/flat/CIAO/ciao/Valuetype_Factories/Factories.mpc index 9c61ca08ea7..c03e88e1ec8 100644 --- a/flat/CIAO/ciao/Valuetype_Factories/Factories.mpc +++ b/flat/CIAO/ciao/Valuetype_Factories/Factories.mpc @@ -1,3 +1,4 @@ +//$Id$ project(CCM_Cookie_Factory) : ccm_stub, ciao_lib { dynamicflags = COOKIE_FACTORY_BUILD_DLL Source_Files { diff --git a/flat/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp b/flat/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp index 177e7e11879..59c788a3e20 100644 --- a/flat/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp +++ b/flat/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp @@ -52,13 +52,13 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv,""); + CORBA::ORB_init (argc, argv); if (parse_args (argc, argv) != 0) diff --git a/flat/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp b/flat/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp index c0e38131be3..60a5ffca9a8 100644 --- a/flat/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp +++ b/flat/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp @@ -58,13 +58,13 @@ parse_args (int argc, char *argv[]) } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv,""); + CORBA::ORB_init (argc, argv); if (parse_args (argc, argv) != 0) { diff --git a/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp index a14b2f1de55..e30388511ce 100644 --- a/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp +++ b/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp @@ -122,8 +122,8 @@ create_BasicSP_BMClosedED_Impl (void) ::Components::EnterpriseComponent::_nil (); ACE_NEW_RETURN (retval, - MyImpl::BMClosedED_exec_i, - ::Components::EnterpriseComponent::_nil ()); + MyImpl::BMClosedED_exec_i, + ::Components::EnterpriseComponent::_nil ()); return retval; } diff --git a/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp index 46959173a6f..b8e9e543408 100644 --- a/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp +++ b/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp @@ -94,8 +94,8 @@ create_BasicSP_BMDisplay_Impl (void) ::Components::EnterpriseComponent::_nil (); ACE_NEW_RETURN (retval, - MyImpl::BMDisplay_exec_i, - ::Components::EnterpriseComponent::_nil ()); + MyImpl::BMDisplay_exec_i, + ::Components::EnterpriseComponent::_nil ()); return retval; } diff --git a/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp b/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp index 30e90ec12b5..e71368dad6c 100644 --- a/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp +++ b/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp @@ -240,8 +240,8 @@ create_BasicSP_EC_Impl (void) ::Components::EnterpriseComponent::_nil (); ACE_NEW_RETURN (retval, - MyImpl::EC_exec_i, - ::Components::EnterpriseComponent::_nil ()); + MyImpl::EC_exec_i, + ::Components::EnterpriseComponent::_nil ()); return retval; } diff --git a/flat/CIAO/examples/BasicSP/EC/client.cpp b/flat/CIAO/examples/BasicSP/EC/client.cpp index 2788ea63634..2106489309f 100644 --- a/flat/CIAO/examples/BasicSP/EC/client.cpp +++ b/flat/CIAO/examples/BasicSP/EC/client.cpp @@ -21,7 +21,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); // Resolve HomeFinder interface diff --git a/flat/CIAO/examples/BasicSP/EC/controller.cpp b/flat/CIAO/examples/BasicSP/EC/controller.cpp index 39f8df1acbb..af7af9f77ff 100644 --- a/flat/CIAO/examples/BasicSP/EC/controller.cpp +++ b/flat/CIAO/examples/BasicSP/EC/controller.cpp @@ -76,8 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + argv); if (parse_args (argc, argv) != 0) { diff --git a/flat/CIAO/examples/Display/GPS/GPS_exec.cpp b/flat/CIAO/examples/Display/GPS/GPS_exec.cpp index 1e4b99adf38..45fce7e02fa 100644 --- a/flat/CIAO/examples/Display/GPS/GPS_exec.cpp +++ b/flat/CIAO/examples/Display/GPS/GPS_exec.cpp @@ -1,3 +1,4 @@ + // $Id$ #include "GPS_exec.h" @@ -47,7 +48,7 @@ void MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *) { // ACE_DEBUG ((LM_DEBUG, -// ACE_TEXT ("GPS: Received Refresh Event\n"))); +// ACE_TEXT ("GPS: Received Refresh Event\n"))); // Refresh position this->positionx_ += ACE_OS::rand () % DISPLACEMENT - (DISPLACEMENT/2); diff --git a/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp b/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp index 02c0c8e2206..109f0f69567 100644 --- a/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp +++ b/flat/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp @@ -21,7 +21,7 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev) ACE_UNUSED_ARG (ev); // ACE_DEBUG ((LM_DEBUG, -// ACE_TEXT ("NAVDISPLAY: Received Refresh Event\n"))); +// ACE_TEXT ("NAVDISPLAY: Received Refresh Event\n"))); // Refresh position HUDisplay::position_var loc = diff --git a/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp b/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp index 2753ab41444..2916d5cfd68 100644 --- a/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp +++ b/flat/CIAO/examples/Null_Component/StaticDAnCEApp.cpp @@ -11,8 +11,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Initialize the ORB so that CORBA::Any will work. CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + argv); try { diff --git a/flat/CIAO/examples/Swapping/Sender/starter.cpp b/flat/CIAO/examples/Swapping/Sender/starter.cpp index 7d04424a61f..6e7d4956379 100644 --- a/flat/CIAO/examples/Swapping/Sender/starter.cpp +++ b/flat/CIAO/examples/Swapping/Sender/starter.cpp @@ -53,8 +53,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - ""); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); if (parse_args (argc, argv) != 0) { diff --git a/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl b/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl index a592ca407e8..302f415811f 100644 --- a/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl +++ b/flat/CIAO/ofccm/Cdmw/CDMW_Deployment.idl @@ -1,5 +1,5 @@ /** - * + * //$Id$ */ #if !defined (CDMW_DEPLOYMENT_EXT) diff --git a/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h b/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h index 130a8ab62de..f3099ee988c 100644 --- a/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h +++ b/flat/CIAO/ofccm/NodeApplication/ComponentInstallation_Impl.h @@ -2,7 +2,7 @@ //============================================================================= /** - * @file ComponentInstallation.h + * @file ComponentInstallation_Impl.h * * $Id$ * diff --git a/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp index 7b6d4f6462d..ecfc64d6865 100644 --- a/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp +++ b/flat/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp @@ -31,8 +31,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + argv); // Resolve HomeFinder interface CORBA::Object_var obj1 diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl b/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl index a28de5948d2..3fcf634906e 100644 --- a/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl +++ b/flat/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl @@ -24,7 +24,7 @@ module Benchmark * define the component executor interface explicitly here. */ local interface RoundTrip_Exec : CCM_RoundTrip, CCM_LatencyTest, - Components::SessionComponent + Components::SessionComponent { }; diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp index 2b708dbf74d..218db8f4ae9 100644 --- a/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp +++ b/flat/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp @@ -92,8 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + argv); if (parse_args(argc, argv) == -1) { diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl index d9009c56e8a..784abd168d4 100644 --- a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl +++ b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl @@ -24,8 +24,8 @@ module Benchmark * define the component executor interface explicitly here. */ local interface RoundTripClient_Exec : CCM_RoundTripClient, - Components::SessionComponent, - CCM_Controller //Monolithic + Components::SessionComponent, + CCM_Controller //Monolithic { }; diff --git a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp index 61b730a2339..98281dfadcc 100644 --- a/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp +++ b/flat/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp @@ -25,8 +25,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - ""); + argv); // Resolve HomeFinder interface CORBA::Object_var obj diff --git a/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp index 6a71d14a6f8..cded99657e5 100644 --- a/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp +++ b/flat/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp @@ -219,8 +219,7 @@ namespace CIDL_ReceiverImpl this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + argv); } diff --git a/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp index f03df3305b1..ea25575a497 100644 --- a/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp +++ b/flat/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp @@ -583,8 +583,7 @@ CIDL_SenderImpl::SenderExec_i::start ( this->orb_ = CORBA::ORB_init (argc, - argv, - ""); + argv); CORBA::Object_var object = this->orb_->resolve_initial_references ("RTORB"); diff --git a/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc b/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc index 74e04bcdf2b..df62ac2c87c 100644 --- a/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc +++ b/flat/CIAO/performance-tests/mico/mico-thrput-st/client.cc @@ -81,7 +81,7 @@ set_priority () } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/flat/CIAO/performance-tests/mico/mico-thrput-st/server.cc b/flat/CIAO/performance-tests/mico/mico-thrput-st/server.cc index 9bf90eda0ed..f6c5b2a397f 100644 --- a/flat/CIAO/performance-tests/mico/mico-thrput-st/server.cc +++ b/flat/CIAO/performance-tests/mico/mico-thrput-st/server.cc @@ -13,7 +13,7 @@ #include "RoundTrip_impl.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "mico-local-orb"); diff --git a/flat/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/flat/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp index 35e86fe63c3..44ceea6235f 100644 --- a/flat/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp +++ b/flat/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp @@ -108,17 +108,17 @@ parse_args //------------------------------------------------------------------- int -main +ACE_TMAIN ( int argc, - char* argv[] + ACE_TCHAR* argv[] ) { try { // Initialize orb CORBA::ORB_var orb = - CORBA::ORB_init( argc, argv, "" ); + CORBA::ORB_init( argc, argv); if( parse_args( argc, argv ) != 0 ) { diff --git a/flat/CIAO/tests/CIAO_ComponentServer/Activator/client.cpp b/flat/CIAO/tests/CIAO_ComponentServer/Activator/client.cpp index ffa31a181e5..82d6e212ae1 100644 --- a/flat/CIAO/tests/CIAO_ComponentServer/Activator/client.cpp +++ b/flat/CIAO/tests/CIAO_ComponentServer/Activator/client.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } int -ACE_TMAIN (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { using namespace CIAO::Deployment; diff --git a/flat/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp b/flat/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp index 0452d615c17..7d57168345e 100644 --- a/flat/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp +++ b/flat/CIAO/tests/CIAO_ComponentServer/SimpleComponent/client.cpp @@ -45,7 +45,7 @@ parse_args (int argc, char *argv[]) } int -ACE_TMAIN (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { using namespace CIAO::Deployment; diff --git a/flat/CIAO/tools/Config_Handlers/Any_Handler.cpp b/flat/CIAO/tools/Config_Handlers/Any_Handler.cpp index 107f3cc6ec5..314e5abde22 100644 --- a/flat/CIAO/tools/Config_Handlers/Any_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/Any_Handler.cpp @@ -27,7 +27,6 @@ namespace CIAO void Any_Handler::extract_into_any (const Any& desc, CORBA::Any& toconfig) - throw (Config_Error) { CIAO_TRACE("Any_Handler::extract_into_any"); try @@ -50,7 +49,6 @@ namespace CIAO } Any Any_Handler::get_any (const ::CORBA::Any& src) - throw (Config_Error) { CIAO_TRACE("Any_Handler::extract_into_any - reverse"); diff --git a/flat/CIAO/tools/Config_Handlers/Any_Handler.h b/flat/CIAO/tools/Config_Handlers/Any_Handler.h index 24454aeea88..03f99722034 100644 --- a/flat/CIAO/tools/Config_Handlers/Any_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/Any_Handler.h @@ -51,11 +51,9 @@ namespace CIAO virtual ~Any_Handler (void); static void extract_into_any (const Any& desc, - ::CORBA::Any& toconfig) - throw (Config_Error); + ::CORBA::Any& toconfig); - static Any get_any (const CORBA::Any &src) - throw (Config_Error); + static Any get_any (const CORBA::Any &src); }; } } diff --git a/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp b/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp index e95c0656506..75fad29366e 100644 --- a/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp @@ -173,7 +173,6 @@ namespace CIAO ::CIAO::DAnCE::EventServiceDeploymentDescriptions const * CIAOEvents_Handler::esd_idl () const - throw (CIAOEvents_Handler::NoESD) { if(!this->idl_esd_.get()) throw NoESD (); @@ -184,7 +183,6 @@ namespace CIAO ::CIAO::DAnCE::EventServiceDeploymentDescriptions * CIAOEvents_Handler::esd_idl () - throw (CIAOEvents_Handler::NoESD) { if(!this->idl_esd_.get()) throw NoESD(); diff --git a/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h b/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h index f45ff89afb4..f977808bc5a 100644 --- a/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h @@ -51,11 +51,9 @@ namespace CIAO ~CIAOEvents_Handler (void); - CIAO::DAnCE::EventServiceDeploymentDescriptions const *esd_idl (void) const - throw (CIAOEvents_Handler::NoESD); - - CIAO::DAnCE::EventServiceDeploymentDescriptions *esd_idl (void) - throw (CIAOEvents_Handler::NoESD); + CIAO::DAnCE::EventServiceDeploymentDescriptions const *esd_idl (void) const; + + CIAO::DAnCE::EventServiceDeploymentDescriptions *esd_idl (void); private: bool build_esd (); diff --git a/flat/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp b/flat/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp index d4f92a9a990..362a47c3b22 100644 --- a/flat/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp +++ b/flat/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) using namespace CIAO::Config_Handlers; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) diff --git a/flat/CIAO/tools/Config_Handlers/DD_Handler.cpp b/flat/CIAO/tools/Config_Handlers/DD_Handler.cpp index 9aee6b42789..ee9fbd79012 100644 --- a/flat/CIAO/tools/Config_Handlers/DD_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/DD_Handler.cpp @@ -170,7 +170,6 @@ namespace CIAO ::Deployment::Domain const * DD_Handler::domain_idl () const - throw (DD_Handler::NoDomain) { if(!this->idl_domain_.get()) throw NoDomain (); @@ -181,7 +180,6 @@ namespace CIAO ::Deployment::Domain * DD_Handler::domain_idl () - throw (DD_Handler::NoDomain) { if(!this->idl_domain_.get()) throw NoDomain(); @@ -192,7 +190,6 @@ namespace CIAO Domain const * DD_Handler::domain_xsc () const - throw (DD_Handler::NoDomain) { if(!this->domain_.get()) throw NoDomain (); @@ -203,7 +200,6 @@ namespace CIAO Domain * DD_Handler::domain_xsc () - throw (DD_Handler::NoDomain) { if(!this->domain_.get()) throw NoDomain (); diff --git a/flat/CIAO/tools/Config_Handlers/DD_Handler.h b/flat/CIAO/tools/Config_Handlers/DD_Handler.h index 05ca0cea49e..f3a9e0c60c9 100644 --- a/flat/CIAO/tools/Config_Handlers/DD_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/DD_Handler.h @@ -67,29 +67,25 @@ DD_Handler(::Deployment::Domain *dmn); * @brief Returns the const IDL domain * @return Domain* the IDL domain pointer */ -::Deployment::Domain const *domain_idl (void) const -throw (NoDomain); + ::Deployment::Domain const *domain_idl (void) const; /** * @brief Returns the IDL domain * @return Domain* the IDL domain pointer */ -::Deployment::Domain *domain_idl (void) -throw (NoDomain); + ::Deployment::Domain *domain_idl (void); /** * @brief Returns the const XSC domain * @return Domain* the XSC domain pointer */ -Domain const *domain_xsc (void) const -throw (NoDomain); + Domain const *domain_xsc (void) const; /** * @brief Returns the XSC domain * @return Domain* the XSC domain pointer */ -Domain *domain_xsc (void) -throw (NoDomain); + Domain *domain_xsc (void); private: /** diff --git a/flat/CIAO/tools/Config_Handlers/DP_Handler.cpp b/flat/CIAO/tools/Config_Handlers/DP_Handler.cpp index e007d8dc4e0..3ee8e394bf5 100644 --- a/flat/CIAO/tools/Config_Handlers/DP_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/DP_Handler.cpp @@ -47,7 +47,6 @@ ACE_RCSID (Config_Handlers, deploymentPlan const * DP_Handler::xsc (void) const - throw (DP_Handler::NoPlan) { if (this->retval_ && this->xsc_dp_.get () != 0) return this->xsc_dp_.get (); @@ -57,7 +56,6 @@ ACE_RCSID (Config_Handlers, deploymentPlan * DP_Handler::xsc (void) - throw (DP_Handler::NoPlan) { if (this->retval_ && this->xsc_dp_.get () != 0) return this->xsc_dp_.release (); @@ -67,7 +65,6 @@ ACE_RCSID (Config_Handlers, ::Deployment::DeploymentPlan const * DP_Handler::plan (void) const - throw (DP_Handler::NoPlan) { if (this->retval_ && this->idl_dp_.get () != 0) return this->idl_dp_.get (); @@ -77,8 +74,6 @@ ACE_RCSID (Config_Handlers, ::Deployment::DeploymentPlan * DP_Handler::plan (void) - throw (DP_Handler::NoPlan) - { if (this->retval_ && this->idl_dp_.get () != 0) return this->idl_dp_.release (); diff --git a/flat/CIAO/tools/Config_Handlers/DP_Handler.h b/flat/CIAO/tools/Config_Handlers/DP_Handler.h index b8e690afe60..82d93aaa62f 100644 --- a/flat/CIAO/tools/Config_Handlers/DP_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/DP_Handler.h @@ -57,19 +57,15 @@ namespace CIAO /// Generates the IDL->XSC mapping. returns /// null if the method fails or if the class was /// constructed with the wrong source. - deploymentPlan const *xsc (void) const - throw (NoPlan); + deploymentPlan const *xsc (void) const; - deploymentPlan *xsc (void) - throw (NoPlan); + deploymentPlan *xsc (void); /// Generates the XSC->IDL mapping. returns null /// if the method fails or the class was constructed - ::Deployment::DeploymentPlan const *plan (void) const - throw (NoPlan); + ::Deployment::DeploymentPlan const *plan (void) const; - ::Deployment::DeploymentPlan *plan (void) - throw (NoPlan); + ::Deployment::DeploymentPlan *plan (void); private: diff --git a/flat/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl b/flat/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl index f7f7446062d..0ffecc5c757 100644 --- a/flat/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl +++ b/flat/CIAO/tools/Config_Handlers/DynAny_Handler/dynany_test.idl @@ -1,3 +1,4 @@ +//$Id$ module dynany_test { typedef sequence<double> DoubleSequence; diff --git a/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp b/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp index 1bd9ec724e8..e03f21236b1 100644 --- a/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp +++ b/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.cpp @@ -227,7 +227,7 @@ bool check_foo_struct (CORBA::Any &any) check_stringseq (&foo->string_sequence); } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { diff --git a/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc b/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc index 8fc572be744..b4124683c7a 100644 --- a/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc +++ b/flat/CIAO/tools/Config_Handlers/DynAny_Handler/test.mpc @@ -1,3 +1,4 @@ +// $Id$ project (XSC_DynAny_Test) : ciao_config_handlers, ifr_client, taoidldefaults { requires += dummy_label exename = test diff --git a/flat/CIAO/tools/Config_Handlers/ESD_Handler.cpp b/flat/CIAO/tools/Config_Handlers/ESD_Handler.cpp index 4bb1134ae44..5e1647f93b9 100644 --- a/flat/CIAO/tools/Config_Handlers/ESD_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/ESD_Handler.cpp @@ -13,7 +13,6 @@ namespace CIAO ESD_Handler::es_deployment_descrs ( const DeploymentPlan &src, Deployment::EventServiceDeploymentDescriptions& dest) - throw (Config_Error) { CIAO_TRACE("ESD_Handler::instance_deployment_descrs"); DeploymentPlan::es_const_iterator esd_e = src.end_instance (); @@ -37,7 +36,6 @@ namespace CIAO const EventServiceDeploymentDescription& src, Deployment::EventServiceDeploymentDescription& dest, CORBA::ULong pos) - throw (Config_Error) { CIAO_TRACE("IDD_Handler::es_deployment_descr"); try @@ -81,7 +79,6 @@ namespace CIAO EventServiceDeploymentDescription ESD_Handler::es_deployment_descr ( const Deployment::EventServiceDeploymentDescription& src) - throw (Config_Error) { CIAO_TRACE("ESD_Handler::es_deployment_descr - reverse"); //Get all the string diff --git a/flat/CIAO/tools/Config_Handlers/ESD_Handler.h b/flat/CIAO/tools/Config_Handlers/ESD_Handler.h index f89480f00e4..b20828a9713 100644 --- a/flat/CIAO/tools/Config_Handlers/ESD_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/ESD_Handler.h @@ -50,12 +50,9 @@ namespace CIAO public: static void es_deployment_descrs ( const DeploymentPlan &src, - ::Deployment::EventServiceDeploymentDescriptions& dest) - throw (Config_Error); + ::Deployment::EventServiceDeploymentDescriptions& dest); - static EventServiceDeploymentDescription es_deployment_descr ( - const Deployment::EventServiceDeploymentDescription &src) - throw (Config_Error); + static EventServiceDeploymentDescription es_deployment_descr (const Deployment::EventServiceDeploymentDescription &src); static IDREF_Base<CORBA::ULong> IDREF; @@ -63,8 +60,7 @@ namespace CIAO static void es_deployment_descr ( const EventServiceDeploymentDescription &src, ::Deployment::EventServiceDeploymentDescription &dest, - CORBA::ULong pos) - throw (Config_Error); + CORBA::ULong pos); }; } } diff --git a/flat/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/flat/CIAO/tools/Config_Handlers/IDD_Handler.cpp index 083e9bfc369..6beded8c2a7 100644 --- a/flat/CIAO/tools/Config_Handlers/IDD_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/IDD_Handler.cpp @@ -19,7 +19,6 @@ namespace CIAO void IDD_Handler::instance_deployment_descrs (const deploymentPlan &src, Deployment::InstanceDeploymentDescriptions& dest) - throw (Config_Error) { CIAO_TRACE("IDD_Handler::instance_deployment_descrs"); deploymentPlan::instance_const_iterator idd_e = @@ -43,7 +42,6 @@ namespace CIAO const InstanceDeploymentDescription& src, Deployment::InstanceDeploymentDescription& dest, CORBA::ULong pos) - throw (Config_Error) { CIAO_TRACE("IDD_Handler::instance_deployment_descr"); try @@ -110,7 +108,6 @@ namespace CIAO InstanceDeploymentDescription IDD_Handler::instance_deployment_descr ( const Deployment::InstanceDeploymentDescription& src) - throw (Config_Error) { CIAO_TRACE("IDD_Handler::instance_deployment_descr - reverse"); //Get all the string/IDREFs diff --git a/flat/CIAO/tools/Config_Handlers/IDD_Handler.h b/flat/CIAO/tools/Config_Handlers/IDD_Handler.h index 957a4cf53e3..313b7d9e6b2 100644 --- a/flat/CIAO/tools/Config_Handlers/IDD_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/IDD_Handler.h @@ -51,19 +51,16 @@ namespace CIAO { public: static void instance_deployment_descrs (const deploymentPlan &src, - ::Deployment::InstanceDeploymentDescriptions& dest) - throw (Config_Error); + ::Deployment::InstanceDeploymentDescriptions& dest); - static InstanceDeploymentDescription instance_deployment_descr (const Deployment::InstanceDeploymentDescription &src) - throw (Config_Error); + static InstanceDeploymentDescription instance_deployment_descr (const Deployment::InstanceDeploymentDescription &src); static IDREF_Base<CORBA::ULong> IDREF; private: static void instance_deployment_descr (const InstanceDeploymentDescription &src, ::Deployment::InstanceDeploymentDescription &dest, - CORBA::ULong pos) - throw (Config_Error); + CORBA::ULong pos); }; } diff --git a/flat/CIAO/tools/Config_Handlers/IDREF_Base.cpp b/flat/CIAO/tools/Config_Handlers/IDREF_Base.cpp index b2249b82895..2b7a8fee190 100644 --- a/flat/CIAO/tools/Config_Handlers/IDREF_Base.cpp +++ b/flat/CIAO/tools/Config_Handlers/IDREF_Base.cpp @@ -19,7 +19,6 @@ namespace CIAO template <typename T> void IDREF_Base<T>::bind_ref (ACE_CString& id, T value) - throw (Config_Error) { CIAO_TRACE("IDREF_Base<T>::bind_ref"); @@ -59,7 +58,6 @@ namespace CIAO template <typename T> void IDREF_Base<T>::find_ref (const ACE_CString& id, T& val) - throw (Config_Error) { CIAO_TRACE("IDREF_Base<T>::find_ref(C_String, T)"); @@ -74,7 +72,6 @@ namespace CIAO template <typename T> void IDREF_Base<T>::find_ref (const T& value, ACE_CString& id) - throw (Config_Error) { CIAO_TRACE("IDREF_Base<T>::find_ref (T, CString)"); diff --git a/flat/CIAO/tools/Config_Handlers/IDREF_Base.h b/flat/CIAO/tools/Config_Handlers/IDREF_Base.h index 85f0d3a4f22..643b4a3fb3d 100644 --- a/flat/CIAO/tools/Config_Handlers/IDREF_Base.h +++ b/flat/CIAO/tools/Config_Handlers/IDREF_Base.h @@ -46,18 +46,15 @@ IDREF_Base (T start_point) } /// Bind an IDREF to an index -void bind_ref (ACE_CString& id, T value) -throw (Config_Error); + void bind_ref (ACE_CString& id, T value); void bind_next_available (ACE_CString &id); /// Get the index associated with an IDREF -void find_ref (const ACE_CString& id, T& value) -throw (Config_Error); + void find_ref (const ACE_CString& id, T& value); /// get the IDREF associated with an index -void find_ref (const T &value, ACE_CString& id) -throw (Config_Error); + void find_ref (const T &value, ACE_CString& id); /// Unbind all IDREFS bool diff --git a/flat/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp b/flat/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp index 6812dc20114..c107fed4a77 100644 --- a/flat/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp +++ b/flat/CIAO/tools/Config_Handlers/Package_Handlers/test.cpp @@ -46,7 +46,7 @@ void check_srd (const Deployment::DeploymentPlan &); using namespace CIAO::Config_Handlers; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { diff --git a/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp b/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp index c4719fd5621..28c829931e8 100644 --- a/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.cpp @@ -53,7 +53,6 @@ namespace CIAO } ORBResources OR_Handler::orb_resources (const ::CIAO::DAnCE::ORBResources &src) - throw (OR_Handler::No_Resource) { if (src.length () == 0 || src[0].threadpool_list.length () == 0 || diff --git a/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h b/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h index 5209aea7da4..7720a230453 100644 --- a/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/RT-CCM/OR_Handler.h @@ -41,8 +41,7 @@ namespace CIAO class No_Resource {}; - static ORBResources orb_resources (const ::CIAO::DAnCE::ORBResources &src) - throw (No_Resource); + static ORBResources orb_resources (const ::CIAO::DAnCE::ORBResources &src); }; diff --git a/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp b/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp index 98392711e65..17ce790182e 100644 --- a/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.cpp @@ -113,7 +113,6 @@ namespace CIAO ::CIAO::DAnCE::ServerResource const * SRD_Handler::srd_idl () const - throw (SRD_Handler::NoSRD) { if(!this->idl_srd_.get()) throw NoSRD (); @@ -124,7 +123,6 @@ namespace CIAO ::CIAO::DAnCE::ServerResource * SRD_Handler::srd_idl () - throw (SRD_Handler::NoSRD) { if(!this->idl_srd_.get()) throw NoSRD(); @@ -135,7 +133,6 @@ namespace CIAO ServerResourcesDef const * SRD_Handler::srd_xsc () const - throw (SRD_Handler::NoSRD) { if(!this->srd_.get()) throw NoSRD (); @@ -146,7 +143,6 @@ namespace CIAO ServerResourcesDef * SRD_Handler::srd_xsc () - throw (SRD_Handler::NoSRD) { if(!this->srd_.get()) throw NoSRD (); diff --git a/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h b/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h index e0347fcbb8a..c55447b5562 100644 --- a/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h +++ b/flat/CIAO/tools/Config_Handlers/RT-CCM/SRD_Handler.h @@ -46,17 +46,13 @@ namespace CIAO ~SRD_Handler (void); - ::CIAO::DAnCE::ServerResource const *srd_idl (void) const - throw (NoSRD); + ::CIAO::DAnCE::ServerResource const *srd_idl (void) const; - ::CIAO::DAnCE::ServerResource *srd_idl (void) - throw (NoSRD); + ::CIAO::DAnCE::ServerResource *srd_idl (void); - ServerResourcesDef const *srd_xsc (void) const - throw (NoSRD); + ServerResourcesDef const *srd_xsc (void) const; - ServerResourcesDef *srd_xsc (void) - throw (NoSRD); + ServerResourcesDef *srd_xsc (void); private: bool build_srd (); diff --git a/flat/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/flat/CIAO/tools/Config_Handlers/RT-CCM/test.cpp index 31a7034a610..0476fddd6cc 100644 --- a/flat/CIAO/tools/Config_Handlers/RT-CCM/test.cpp +++ b/flat/CIAO/tools/Config_Handlers/RT-CCM/test.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) using namespace CIAO::Config_Handlers; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) diff --git a/flat/CIAO/tools/Config_Handlers/XML_Typedefs.h b/flat/CIAO/tools/Config_Handlers/XML_Typedefs.h index e40a7d2465a..f0054df2e57 100644 --- a/flat/CIAO/tools/Config_Handlers/XML_Typedefs.h +++ b/flat/CIAO/tools/Config_Handlers/XML_Typedefs.h @@ -1,7 +1,7 @@ /** * @file XML_Typedefs.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * $Id$ * Typedefs from the XML Utilities. */ #ifndef XML_TYPEDEFS_H diff --git a/flat/CIAO/tools/Config_Handlers/test.cpp b/flat/CIAO/tools/Config_Handlers/test.cpp index 1fea207ad47..fd50374aa7e 100644 --- a/flat/CIAO/tools/Config_Handlers/test.cpp +++ b/flat/CIAO/tools/Config_Handlers/test.cpp @@ -43,7 +43,7 @@ void check_srd (const Deployment::DeploymentPlan &); using namespace CIAO::Config_Handlers; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) diff --git a/flat/CIAO/tools/IDL3_to_IDL2/cdmw_idl.cpp b/flat/CIAO/tools/IDL3_to_IDL2/cdmw_idl.cpp index 2aa4c1fc2aa..4aa132a0208 100644 --- a/flat/CIAO/tools/IDL3_to_IDL2/cdmw_idl.cpp +++ b/flat/CIAO/tools/IDL3_to_IDL2/cdmw_idl.cpp @@ -395,7 +395,7 @@ DRV_drive (const char *s) */ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Initialize driver and global variables. int init_status = DRV_init (argc, argv); diff --git a/flat/CIAO/tools/XML/XercesString.cpp b/flat/CIAO/tools/XML/XercesString.cpp index 32150a7505b..e66d4b891ad 100644 --- a/flat/CIAO/tools/XML/XercesString.cpp +++ b/flat/CIAO/tools/XML/XercesString.cpp @@ -87,7 +87,7 @@ namespace CIAO { XMLCh *result = new XMLCh[ size() - (tail - head) + 1 ]; XMLCh *target = result; - bOK = target != NULL; + bOK = target != 0; if (bOK) { const XMLCh *cursor = begin(); |