diff options
Diffstat (limited to 'CIAO')
41 files changed, 91 insertions, 89 deletions
diff --git a/CIAO/ciao/CCM_CCM2Context.idl b/CIAO/ciao/CCM_CCM2Context.idl index d0533714ad1..0c39c383d68 100644 --- a/CIAO/ciao/CCM_CCM2Context.idl +++ b/CIAO/ciao/CCM_CCM2Context.idl @@ -16,8 +16,8 @@ #if !defined (CCM_2CONTEXT_IDL) #define CCM_2CONTEXT_IDL -#include "CCM_Container.idl" -#include "CCM_HomeRegistration.idl" +#include "ciao/CCM_Container.idl" +#include "ciao/CCM_HomeRegistration.idl" #include <CosPersistentState.idl> // *************** Extended Container Interfaces *************** diff --git a/CIAO/ciao/CCM_Component.idl b/CIAO/ciao/CCM_Component.idl index a19ce9b4099..5c9cd2ec3e7 100644 --- a/CIAO/ciao/CCM_Component.idl +++ b/CIAO/ciao/CCM_Component.idl @@ -14,9 +14,9 @@ #if !defined (CCM_COMPONENT_IDL) #define CCM_COMPONENT_IDL -#include "CCM_Event.idl" -#include "CCM_Home.idl" -#include "CCM_Object.idl" -#include "CCM_Enumeration.idl" +#include "ciao/CCM_Event.idl" +#include "ciao/CCM_Home.idl" +#include "ciao/CCM_Object.idl" +#include "ciao/CCM_Enumeration.idl" #endif /* CCM_COMPONENT_IDL */ diff --git a/CIAO/ciao/CCM_Configurator.idl b/CIAO/ciao/CCM_Configurator.idl index 1c908bde6ce..8992bb9bb65 100644 --- a/CIAO/ciao/CCM_Configurator.idl +++ b/CIAO/ciao/CCM_Configurator.idl @@ -14,8 +14,8 @@ #if !defined (CCM_CONFIGURATOR_IDL) #define CCM_CONFIGURATOR_IDL -#include "CCM_Event.idl" -#include "CCM_Home.idl" +#include "ciao/CCM_Event.idl" +#include "ciao/CCM_Home.idl" module Components { diff --git a/CIAO/ciao/CCM_Container.idl b/CIAO/ciao/CCM_Container.idl index 4eb3f268da9..8a66382fe46 100644 --- a/CIAO/ciao/CCM_Container.idl +++ b/CIAO/ciao/CCM_Container.idl @@ -16,11 +16,11 @@ #if !defined (CCM_CONTAINER_IDL) #define CCM_CONTAINER_IDL -#include "CCM_Component.idl" -#include "CCM_Context.idl" -#include "CCM_CCMException.idl" -#include "CCM_EnterpriseComponent.idl" -#include "CCM_HomeExecutorBase.idl" +#include "ciao/CCM_Component.idl" +#include "ciao/CCM_Context.idl" +#include "ciao/CCM_CCMException.idl" +#include "ciao/CCM_EnterpriseComponent.idl" +#include "ciao/CCM_HomeExecutorBase.idl" // *************** Basic Container interfaces *************** diff --git a/CIAO/ciao/CCM_Container_Ex.idl b/CIAO/ciao/CCM_Container_Ex.idl index def43f81a46..b8425fc0ab9 100644 --- a/CIAO/ciao/CCM_Container_Ex.idl +++ b/CIAO/ciao/CCM_Container_Ex.idl @@ -16,9 +16,9 @@ #if !defined (CCM_CONTAINER_EX_IDL) #define CCM_CONTAINER_EX_IDL -#include "CCM_Container.idl" -#include "CCM_Session2Context.idl" -#include "CCM_EntityContext.idl" +#include "ciao/CCM_Container.idl" +#include "ciao/CCM_Session2Context.idl" +#include "ciao/CCM_EntityContext.idl" #include <CosPersistentState.idl> // *************** Extended Container Interfaces *************** diff --git a/CIAO/ciao/CCM_Context.idl b/CIAO/ciao/CCM_Context.idl index 21a47aee4c8..3250ca32264 100644 --- a/CIAO/ciao/CCM_Context.idl +++ b/CIAO/ciao/CCM_Context.idl @@ -3,9 +3,9 @@ #if !defined (CCM_CONTEXT_IDL) #define CCM_CONTEXT_IDL -#include "Security.idl" -#include "CCM_Transaction.idl" -#include "CCM_Home.idl" +#include "ciao/Security.idl" +#include "ciao/CCM_Transaction.idl" +#include "ciao/CCM_Home.idl" // *************** Basic Container interfaces *************** diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc index dfd0790ecf2..76d7d715651 100644 --- a/CIAO/ciao/CCM_Core.mpc +++ b/CIAO/ciao/CCM_Core.mpc @@ -8,7 +8,7 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client { idlflags += -Wb,skel_export_macro=CIAO_CONTAINER_Export // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT)/DAnCE + includes += $(CIAO_ROOT) dynamicflags = CIAO_CLIENT_BUILD_DLL @@ -81,7 +81,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client dynamicflags = CIAO_CONTAINER_BUILD_DLL // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT)/DAnCE + includes += $(CIAO_ROOT) IDL_Files { idlflags += -SS -Sci @@ -150,7 +150,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b sharedname = CIAO_Deployment_stub // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT) + includes += $(CIAO_ROOT) idlflags += -Wb,stub_export_macro=Deployment_stub_Export idlflags += -Wb,stub_export_include=Deployment_stub_export.h @@ -229,7 +229,7 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien idlflags += -Wb,skel_export_include=Deployment_svnt_export.h // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT) + includes += $(CIAO_ROOT) IDL_Files { } @@ -254,7 +254,6 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien } project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt { - includes += $(CIAO_ROOT)/ciao includes += $(CIAO_ROOT) sharedname = CIAO_DnC_Server idlflags += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export diff --git a/CIAO/ciao/CCM_EntityComponent.idl b/CIAO/ciao/CCM_EntityComponent.idl index 28342b37b84..0b04ad7131a 100644 --- a/CIAO/ciao/CCM_EntityComponent.idl +++ b/CIAO/ciao/CCM_EntityComponent.idl @@ -16,9 +16,9 @@ #if !defined (CCM_ENTITYCOMPONENT_IDL) #define CCM_ENTITYCOMPONENT_IDL -#include "CCM_CCMException.idl" -#include "CCM_EnterpriseComponent.idl" -#include "CCM_EntityContext.idl" +#include "ciao/CCM_CCMException.idl" +#include "ciao/CCM_EnterpriseComponent.idl" +#include "ciao/CCM_EntityContext.idl" module Components { diff --git a/CIAO/ciao/CCM_EntityContext.idl b/CIAO/ciao/CCM_EntityContext.idl index 87b199c74c1..ee02b728afb 100644 --- a/CIAO/ciao/CCM_EntityContext.idl +++ b/CIAO/ciao/CCM_EntityContext.idl @@ -16,8 +16,8 @@ #if !defined (CCM_ENTITYCONTEXT_IDL) #define CCM_ENTITYCONTEXT_IDL -#include "CCM_Context.idl" -#include "CCM_Object.idl" +#include "ciao/CCM_Context.idl" +#include "ciao/CCM_Object.idl" module Components { diff --git a/CIAO/ciao/CCM_Enumeration.idl b/CIAO/ciao/CCM_Enumeration.idl index cec9e60da19..55d64b68e07 100644 --- a/CIAO/ciao/CCM_Enumeration.idl +++ b/CIAO/ciao/CCM_Enumeration.idl @@ -14,7 +14,7 @@ #if !defined (CCM_ENUMERATION_IDL) #define CCM_ENUMERATION_IDL -#include "CCM_Object.idl" +#include "ciao/CCM_Object.idl" module Components { diff --git a/CIAO/ciao/CCM_Event.idl b/CIAO/ciao/CCM_Event.idl index b149e0bbd28..876777bcb22 100644 --- a/CIAO/ciao/CCM_Event.idl +++ b/CIAO/ciao/CCM_Event.idl @@ -16,10 +16,10 @@ #if !defined (CCM_EVENT_IDL) #define CCM_EVENT_IDL -#include "CCM_Base.idl" -#include "CCM_Navigation.idl" -#include "CCM_Receptacle.idl" -#include "CCM_Cookie.idl" +#include "ciao/CCM_Base.idl" +#include "ciao/CCM_Navigation.idl" +#include "ciao/CCM_Receptacle.idl" +#include "ciao/CCM_Cookie.idl" #include "tao/orb_types.pidl" module Components diff --git a/CIAO/ciao/CCM_HomeConfigurator.idl b/CIAO/ciao/CCM_HomeConfigurator.idl index d2c254ce078..a39034f77da 100644 --- a/CIAO/ciao/CCM_HomeConfigurator.idl +++ b/CIAO/ciao/CCM_HomeConfigurator.idl @@ -14,8 +14,8 @@ #if !defined (CCM_HOMECONFIGURATOR_IDL) #define CCM_HOMECONFIGURATOR_IDL -#include "CCM_Configurator.idl" -#include "CCM_StandardConfigurator.idl" +#include "ciao/CCM_Configurator.idl" +#include "ciao/CCM_StandardConfigurator.idl" module Components { diff --git a/CIAO/ciao/CCM_HomeRegistration.idl b/CIAO/ciao/CCM_HomeRegistration.idl index f724b908337..e7ee299e11c 100644 --- a/CIAO/ciao/CCM_HomeRegistration.idl +++ b/CIAO/ciao/CCM_HomeRegistration.idl @@ -16,7 +16,7 @@ #if !defined (CCM_HOMEREGISTRATION_IDL) #define CCM_HOMEREGISTRATION_IDL -#include "CCM_Home.idl" +#include "ciao/CCM_Home.idl" module Components { diff --git a/CIAO/ciao/CCM_KeylessCCMHome.idl b/CIAO/ciao/CCM_KeylessCCMHome.idl index 3b27b2b8cb2..747c45a5117 100644 --- a/CIAO/ciao/CCM_KeylessCCMHome.idl +++ b/CIAO/ciao/CCM_KeylessCCMHome.idl @@ -14,7 +14,7 @@ #if !defined (CCM_KEYLESSCCMHOME_IDL) #define CCM_KEYLESSCCMHOME_IDL -#include "CCM_Home.idl" +#include "ciao/CCM_Home.idl" module Components { diff --git a/CIAO/ciao/CCM_Object.idl b/CIAO/ciao/CCM_Object.idl index fc7309ddcdd..0d0cad45a36 100644 --- a/CIAO/ciao/CCM_Object.idl +++ b/CIAO/ciao/CCM_Object.idl @@ -14,9 +14,9 @@ #if !defined (CCM_OBJECT_IDL) #define CCM_OBJECT_IDL -#include "CCM_Event.idl" -#include "CCM_Navigation.idl" -#include "CCM_Home.idl" +#include "ciao/CCM_Event.idl" +#include "ciao/CCM_Navigation.idl" +#include "ciao/CCM_Home.idl" module Components { diff --git a/CIAO/ciao/CCM_ProxyHomeRegistration.idl b/CIAO/ciao/CCM_ProxyHomeRegistration.idl index f15cce2a25e..084b113a50d 100644 --- a/CIAO/ciao/CCM_ProxyHomeRegistration.idl +++ b/CIAO/ciao/CCM_ProxyHomeRegistration.idl @@ -16,7 +16,7 @@ #if !defined (CCM_PROXYHOMEREGISTRATION_IDL) #define CCM_PROXYHOMEREGISTRATION_IDL -#include "CCM_HomeRegistration.idl" +#include "ciao/CCM_HomeRegistration.idl" module Components { diff --git a/CIAO/ciao/CCM_Receptacle.idl b/CIAO/ciao/CCM_Receptacle.idl index 5aafe192c73..2ed7863b349 100644 --- a/CIAO/ciao/CCM_Receptacle.idl +++ b/CIAO/ciao/CCM_Receptacle.idl @@ -17,9 +17,9 @@ #if !defined (CCM_RECEPTACLE_IDL) #define CCM_RECEPTACLE_IDL -#include "CCM_Base.idl" -#include "CCM_Navigation.idl" -#include "CCM_Cookie.idl" +#include "ciao/CCM_Base.idl" +#include "ciao/CCM_Navigation.idl" +#include "ciao/CCM_Cookie.idl" module Components { diff --git a/CIAO/ciao/CCM_Session2Context.idl b/CIAO/ciao/CCM_Session2Context.idl index 72b6b72ef04..8fec0e9441c 100644 --- a/CIAO/ciao/CCM_Session2Context.idl +++ b/CIAO/ciao/CCM_Session2Context.idl @@ -16,7 +16,7 @@ #if !defined (CCM_SESSION2CONTEXT_IDL) #define CCM_SESSION2CONTEXT_IDL -#include "CCM_CCM2Context.idl" +#include "ciao/CCM_CCM2Context.idl" // *************** Extended Container Interfaces *************** diff --git a/CIAO/ciao/CCM_SessionSynchronization.idl b/CIAO/ciao/CCM_SessionSynchronization.idl index 1e94b10ac34..27614d3e14e 100644 --- a/CIAO/ciao/CCM_SessionSynchronization.idl +++ b/CIAO/ciao/CCM_SessionSynchronization.idl @@ -16,7 +16,7 @@ #if !defined (CCM_SESSIONSYNCHRONIZATION_IDL) #define CCM_SESSIONSYNCHRONIZATION_IDL -#include "CCM_CCMException.idl" +#include "ciao/CCM_CCMException.idl" // *************** Basic Container interfaces *************** diff --git a/CIAO/ciao/CCM_StandardConfigurator.idl b/CIAO/ciao/CCM_StandardConfigurator.idl index e22ea585498..cf602d127eb 100644 --- a/CIAO/ciao/CCM_StandardConfigurator.idl +++ b/CIAO/ciao/CCM_StandardConfigurator.idl @@ -14,7 +14,7 @@ #if !defined (CCM_STANDARDCONFIGURATOR_IDL) #define CCM_STANDARDCONFIGURATOR_IDL -#include "CCM_Configurator.idl" +#include "ciao/CCM_Configurator.idl" module Components { diff --git a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl b/CIAO/ciao/CIAO_NodeApplication_CallBack.idl index fdd67b1e6b1..35cf8afabdd 100644 --- a/CIAO/ciao/CIAO_NodeApplication_CallBack.idl +++ b/CIAO/ciao/CIAO_NodeApplication_CallBack.idl @@ -9,8 +9,8 @@ * NodeApplication. */ -#include "Deployment_NodeApplication.idl" -#include "Deployment_NodeApplicationManager.idl" +#include "ciao/Deployment_NodeApplication.idl" +#include "ciao/Deployment_NodeApplicationManager.idl" module CIAO { diff --git a/CIAO/ciao/CIAO_SwapExec.idl b/CIAO/ciao/CIAO_SwapExec.idl index 94aa99efd65..2349988f46d 100644 --- a/CIAO/ciao/CIAO_SwapExec.idl +++ b/CIAO/ciao/CIAO_SwapExec.idl @@ -1,6 +1,6 @@ // $Id$ -#include "CCM_EnterpriseComponent.idl" +#include "ciao/CCM_EnterpriseComponent.idl" module CIAO { diff --git a/CIAO/ciao/CIAO_UpgradeableContext.idl b/CIAO/ciao/CIAO_UpgradeableContext.idl index 343c512abe6..6d4b315ae85 100644 --- a/CIAO/ciao/CIAO_UpgradeableContext.idl +++ b/CIAO/ciao/CIAO_UpgradeableContext.idl @@ -1,6 +1,6 @@ // $Id$ -#include "CCM_Container.idl" +#include "ciao/CCM_Container.idl" #include "tao/PortableServer/PortableServer_include.pidl" module CIAO diff --git a/CIAO/ciao/Components.idl b/CIAO/ciao/Components.idl index d73c101d2cc..f58740eae6a 100644 --- a/CIAO/ciao/Components.idl +++ b/CIAO/ciao/Components.idl @@ -9,10 +9,10 @@ #if !defined (CIAO_COMPONENTS_IDL) #define CIAO_COMPONENTS_IDL -#include "CCM_Component.idl" -#include "CCM_KeylessCCMHome.idl" -#include "CCM_Home.idl" -#include "CCM_Object.idl" +#include "ciao/CCM_Component.idl" +#include "ciao/CCM_KeylessCCMHome.idl" +#include "ciao/CCM_Home.idl" +#include "ciao/CCM_Object.idl" #endif /* CIAO_COMPONENTS_IDL */ diff --git a/CIAO/ciao/Deployment.idl b/CIAO/ciao/Deployment.idl index ec29cb7bfcc..793c44fc853 100644 --- a/CIAO/ciao/Deployment.idl +++ b/CIAO/ciao/Deployment.idl @@ -3,8 +3,8 @@ #ifndef DEPLOYMENT_IDL #define DEPLOYMENT_IDL -#include "Deployment_Packaging_Data.idl" -#include "Deployment_Target_Data.idl" +#include "ciao/Deployment_Packaging_Data.idl" +#include "ciao/Deployment_Target_Data.idl" module Deployment { diff --git a/CIAO/ciao/Deployment_Application.idl b/CIAO/ciao/Deployment_Application.idl index 4ae531357c5..df03887cf7d 100644 --- a/CIAO/ciao/Deployment_Application.idl +++ b/CIAO/ciao/Deployment_Application.idl @@ -3,7 +3,7 @@ #if !defined (DEPLOYMENT_APPLICATION_IDL) #define DEPLOYMENT_APPLICATION_IDL -#include "Deployment_Connection.idl" +#include "ciao/Deployment_Connection.idl" module Deployment { diff --git a/CIAO/ciao/Deployment_ApplicationManager.idl b/CIAO/ciao/Deployment_ApplicationManager.idl index df613a5a6a9..98fe247f2f9 100644 --- a/CIAO/ciao/Deployment_ApplicationManager.idl +++ b/CIAO/ciao/Deployment_ApplicationManager.idl @@ -2,8 +2,8 @@ #ifndef DEPLOYMENT_APPLICATIONMANAGER_IDL #define DEPLOYMENT_APPLICATIONMANAGER_IDL -#include "Deployment_Core.idl" -#include "Deployment.idl" +#include "ciao/Deployment_Core.idl" +#include "ciao/Deployment.idl" module Deployment { exception ResourceNotAvailable { diff --git a/CIAO/ciao/Deployment_Base.idl b/CIAO/ciao/Deployment_Base.idl index 5b9618dfab2..cb98f5d05b6 100644 --- a/CIAO/ciao/Deployment_Base.idl +++ b/CIAO/ciao/Deployment_Base.idl @@ -3,8 +3,6 @@ #ifndef DEPLOYMENT_BASE_IDL #define DEPLOYMENT_BASE_IDL -#include <orb.idl> - module Deployment { struct Property diff --git a/CIAO/ciao/Deployment_Connection.idl b/CIAO/ciao/Deployment_Connection.idl index 8fb182ecf2e..769c331a748 100644 --- a/CIAO/ciao/Deployment_Connection.idl +++ b/CIAO/ciao/Deployment_Connection.idl @@ -3,7 +3,7 @@ #if !defined (DEPLOYMENT_CONNECTION_IDL) #define DEPLOYMENT_CONNECTION_IDL -#include "Deployment_DeploymentPlan.idl" +#include "ciao/Deployment_DeploymentPlan.idl" #include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl> // *************** Packaging and Deployment *************** diff --git a/CIAO/ciao/Deployment_Container.idl b/CIAO/ciao/Deployment_Container.idl index cc3cb99aafc..55ac0c7dfdd 100644 --- a/CIAO/ciao/Deployment_Container.idl +++ b/CIAO/ciao/Deployment_Container.idl @@ -3,8 +3,8 @@ #if !defined (DEPLOYMENT_CONTAINER_IDL) #define DEPLOYMENT_CONTAINER_IDL -#include "Deployment_Application.idl" -#include "Deployment_Core.idl" +#include "ciao/Deployment_Application.idl" +#include "ciao/Deployment_Core.idl" // *************** Packaging and Deployment *************** module Deployment diff --git a/CIAO/ciao/Deployment_Core.idl b/CIAO/ciao/Deployment_Core.idl index bb9f36dc8e3..fbaa5ea18c6 100644 --- a/CIAO/ciao/Deployment_Core.idl +++ b/CIAO/ciao/Deployment_Core.idl @@ -3,10 +3,10 @@ #if !defined (DEPLOYMENT_CORE_IDL) #define DEPLOYMENT_CORE_IDL -#include "CCM_Component.idl" -#include "Deployment_TargetData.idl" -#include "Deployment_Data.idl" -#include "Deployment_Application.idl" +#include "ciao/CCM_Component.idl" +#include "ciao/Deployment_TargetData.idl" +#include "ciao/Deployment_Data.idl" +#include "ciao/Deployment_Application.idl" // *************** Packaging and Deployment *************** module Deployment diff --git a/CIAO/ciao/Deployment_Data.idl b/CIAO/ciao/Deployment_Data.idl index ebc07ca809e..0c296a815ba 100644 --- a/CIAO/ciao/Deployment_Data.idl +++ b/CIAO/ciao/Deployment_Data.idl @@ -2,7 +2,8 @@ #ifndef DEPLOYMENT_DATA_IDL #define DEPLOYMENT_DATA_IDL -#include "Deployment_DeploymentPlan.idl" + +#include "ciao/Deployment_DeploymentPlan.idl" module Deployment { diff --git a/CIAO/ciao/Deployment_DeploymentPlan.idl b/CIAO/ciao/Deployment_DeploymentPlan.idl index af667ce6d93..e8dbde8ae2b 100644 --- a/CIAO/ciao/Deployment_DeploymentPlan.idl +++ b/CIAO/ciao/Deployment_DeploymentPlan.idl @@ -2,7 +2,11 @@ #ifndef DEPLOYMENT_DEPLOYMENTPLAN_IDL #define DEPLOYMENT_DEPLOYMENTPLAN_IDL -#include "Deployment_Base.idl" + +#include "ciao/Deployment_Base.idl" +#include "tao/StringSeq.pidl" +#include "tao/ULongSeq.pidl" +#include "tao/Typecode_types.pidl" module Deployment { diff --git a/CIAO/ciao/Deployment_DomainApplicationManager.idl b/CIAO/ciao/Deployment_DomainApplicationManager.idl index 39733ce2dfe..65b7523959e 100644 --- a/CIAO/ciao/Deployment_DomainApplicationManager.idl +++ b/CIAO/ciao/Deployment_DomainApplicationManager.idl @@ -2,9 +2,9 @@ #ifndef DOMAINAPPLICATIONMANAGER_IDL #define DOMAINAPPLICATIONMANAGER_IDL -#include "Deployment.idl" -#include "Deployment_NodeApplication.idl" -#include "Deployment_ApplicationManager.idl" +#include "ciao/Deployment.idl" +#include "ciao/Deployment_NodeApplication.idl" +#include "ciao/Deployment_ApplicationManager.idl" module Deployment { /// CIAO 's DomainApplicationManager interface differs spec-defined interface diff --git a/CIAO/ciao/Deployment_Events.idl b/CIAO/ciao/Deployment_Events.idl index 1d4d431287c..538beaee2be 100644 --- a/CIAO/ciao/Deployment_Events.idl +++ b/CIAO/ciao/Deployment_Events.idl @@ -11,8 +11,6 @@ #if !defined (CIAO_DEPLOYMENT_EVENT_SERVICES_IDL) #define CIAO_DEPLOYMENT_EVENT_SERVICES_IDL -#include <orb.idl> - module CIAO { module DAnCE diff --git a/CIAO/ciao/Deployment_ExecutionManager.idl b/CIAO/ciao/Deployment_ExecutionManager.idl index 0e4e3da599a..39c2ba6053b 100644 --- a/CIAO/ciao/Deployment_ExecutionManager.idl +++ b/CIAO/ciao/Deployment_ExecutionManager.idl @@ -2,8 +2,8 @@ #ifndef EXECUTIONMANAGER_IDL #define EXECUTIONMANAGER_IDL -#include "Deployment.idl" -#include "Deployment_DomainApplicationManager.idl" +#include "ciao/Deployment.idl" +#include "ciao/Deployment_DomainApplicationManager.idl" module Deployment { interface ExecutionManager { diff --git a/CIAO/ciao/Deployment_NodeManager.idl b/CIAO/ciao/Deployment_NodeManager.idl index 1d524cd7932..e6672764115 100644 --- a/CIAO/ciao/Deployment_NodeManager.idl +++ b/CIAO/ciao/Deployment_NodeManager.idl @@ -2,9 +2,9 @@ #ifndef NODEMANAGER_IDL #define NODEMANAGER_IDL -#include "Deployment.idl" -#include "Deployment_Core.idl" -#include "Deployment_TargetManager.idl" +#include "ciao/Deployment.idl" +#include "ciao/Deployment_Core.idl" +#include "ciao/Deployment_TargetManager.idl" module Deployment { diff --git a/CIAO/ciao/Deployment_Packaging_Data.idl b/CIAO/ciao/Deployment_Packaging_Data.idl index 533116196eb..ed3d0feecb2 100644 --- a/CIAO/ciao/Deployment_Packaging_Data.idl +++ b/CIAO/ciao/Deployment_Packaging_Data.idl @@ -3,7 +3,7 @@ #ifndef PACKAGING_DATA_IDL #define PACKAGING_DATA_IDL -#include "Deployment_Data.idl" +#include "ciao/Deployment_Data.idl" module Deployment { diff --git a/CIAO/ciao/Deployment_RepositoryManager.idl b/CIAO/ciao/Deployment_RepositoryManager.idl index 6dc073ed381..539d2954416 100644 --- a/CIAO/ciao/Deployment_RepositoryManager.idl +++ b/CIAO/ciao/Deployment_RepositoryManager.idl @@ -2,8 +2,8 @@ #ifndef REPOSITORY_MANAGER_IDL #define REPOSITORY_MANAGER_IDL -#include "Deployment_Packaging_Data.idl" -#include "Deployment.idl" +#include "ciao/Deployment_Packaging_Data.idl" +#include "ciao/Deployment.idl" module Deployment { diff --git a/CIAO/ciao/Deployment_TargetData.idl b/CIAO/ciao/Deployment_TargetData.idl index 09af2acddc4..82cff14ca83 100644 --- a/CIAO/ciao/Deployment_TargetData.idl +++ b/CIAO/ciao/Deployment_TargetData.idl @@ -4,6 +4,8 @@ #define DEPLOYMENT_TARGETDATA_IDL #include "ciao/Deployment_Base.idl" +#include "tao/StringSeq.pidl" +#include "tao/ULongSeq.pidl" module Deployment { diff --git a/CIAO/ciao/Deployment_TargetManager.idl b/CIAO/ciao/Deployment_TargetManager.idl index 732e0ce674b..ff47c8af43e 100644 --- a/CIAO/ciao/Deployment_TargetManager.idl +++ b/CIAO/ciao/Deployment_TargetManager.idl @@ -3,11 +3,11 @@ #ifndef TARGETMANAGER_IDL #define TARGETMANAGER_IDL -#include "Deployment_Target_Data.idl" -#include "Deployment_TargetData.idl" -#include "Deployment_DeploymentPlan.idl" +#include "ciao/Deployment_Target_Data.idl" +#include "ciao/Deployment_TargetData.idl" +#include "ciao/Deployment_DeploymentPlan.idl" // Only needed for ResourceNotAvailable but that should go, so this include also -#include "Deployment_ApplicationManager.idl" +#include "ciao/Deployment_ApplicationManager.idl" module Deployment { |