1 files changed, 52 insertions, 178 deletions
diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc
index 5bd4fa487ba..339c4d2f387 100644
--- a/CIAO/ciao/CCM_Core.mpc
+++ b/CIAO/ciao/CCM_Core.mpc
@@ -8,70 +8,23 @@ 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)
+  includes += $(CIAO_ROOT)/DAnCE
 
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
-    idlflags += -SS -Sci
     CCM_Base.idl
+    CCM_Event.idl
     CCM_Component.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS
-    CCM_Cookie.idl
-    CCM_Enumeration.idl
-  }
-
-  IDL_Files {
-    idlflags += -Ssi -Sci
-    Components.idl
-  }
-
-  IDL_Files {
-    CCM_HomeConfiguration.idl
-    CCM_StandardConfigurator.idl
-    CCM_Home.idl
-    CCM_Object.idl
-    CCM_PrimaryKeyBase.idl
-  }
-
-  IDL_Files {
-    idlflags += -Ssi
-    CCM_HomeFinder.idl
-    CCM_Configurator.idl
-    CCM_KeylessCCMHome.idl
-    CCM_Navigation.idl
-    CCM_Receptacle.idl
-  }
-
-  IDL_Files {
-    CCM_Events.idl
-    CCM_EventBase.idl
-    CCM_EventConsumerBase.idl
+    CIAO_Value.idl
   }
 
   Source_Files {
     CCM_BaseC.cpp
-    CCM_EventsC.cpp
-    CCM_EventBaseC.cpp
-    CCM_EventConsumerBaseC.cpp
+    CCM_EventC.cpp
     CCM_ComponentC.cpp
-    CCM_EnumerationC.cpp
-    CCM_HomeC.cpp
-    CCM_ConfiguratorC.cpp
-    CCM_HomeConfigurationC.cpp
-    CCM_KeylessCCMHomeC.cpp
-    CCM_StandardConfiguratorC.cpp
-    CCM_HomeFinderC.cpp
-    CCM_NavigationC.cpp
-    CCM_ReceptacleC.cpp
-    CCM_CookieC.cpp
-    CCM_ObjectC.cpp
-    CCM_PrimaryKeyBaseC.cpp
+    CIAO_ValueC.cpp
     Client_init.cpp
-    ComponentsC.cpp
   }
 
   Header_Files {
@@ -80,93 +33,35 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
+project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc {
   sharedname  = CIAO_DnC_Container
   idlflags   += -Wb,export_include=CIAO_Container_Export.h
   idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
   // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  IDL_Files {
-    idlflags += -SS -Sci \
-                -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
-                -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
-    Security.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS -Sci
-    CCM_Context.idl
-    CCM_CCMException.idl
-    CCM_EntityComponent.idl
-    CCM_EntityContext.idl
-    CIAO_SwapExec.idl
-    CIAO_UpgradeableContext.idl
-  }
+  includes += $(CIAO_ROOT)/DAnCE
 
   IDL_Files {
-    idlflags += -SS
-    CCM_CCM2Context.idl
-    CCM_ProxyHomeRegistration.idl
-    CCM_Session2Context.idl
     CCM_Transaction.idl
     CosPersistentState.idl
     CCM_Container.idl
-    CCM_SessionContext.idl
-    CCM_SessionComponent.idl
     CCM_Container_Ex.idl
-    CCM_StateIdFactory.idl
-    CCM_Entity2Context.idl
-    CCM_ComponentId.idl
-    CCM_ExecutorLocator.idl
-    CCM_EnterpriseComponent.idl
-    CCM_SessionSynchronization.idl
-    CCM_HomeRegistration.idl
-    CCM_HomeExecutorBase.idl
+    SwapExec.idl
+    UpgradeableContext.idl
   }
 
   Source_Files {
     CCM_TransactionC.cpp
     CosPersistentStateC.cpp
     CCM_ContainerC.cpp
-    CCM_SessionContextC.cpp
-    CCM_SessionComponentC.cpp
-    CCM_EnterpriseComponentC.cpp
-    CCM_SessionSynchronizationC.cpp
-    CCM_CCMExceptionC.cpp
-    CCM_ContextC.cpp
-    SecurityC.cpp
     CCM_Container_ExC.cpp
-    CCM_StateIdFactoryC.cpp
-    CCM_ComponentIdC.cpp
-    CCM_Entity2ContextC.cpp
-    CCM_ExecutorLocatorC.cpp
-    CCM_ProxyHomeRegistrationC.cpp
-    CCM_Session2ContextC.cpp
-    CCM_CCM2ContextC.cpp
-    CCM_HomeRegistrationC.cpp
-    CCM_HomeExecutorBaseC.cpp
-    CCM_EntityContextC.cpp
-    CCM_EntityComponentC.cpp
-    CCM_EventsS.cpp
-    CCM_EventConsumerBaseS.cpp
-    CCM_EventBaseS.cpp
-    CCM_ConfiguratorS.cpp
-    CCM_HomeConfigurationS.cpp
-    CCM_KeylessCCMHomeS.cpp
-    CCM_StandardConfiguratorS.cpp
-    CCM_HomeS.cpp
-    CCM_ObjectS.cpp
-    CCM_PrimaryKeyBaseS.cpp
-    CCM_HomeFinderS.cpp
-    CCM_NavigationS.cpp
-    CCM_ReceptacleS.cpp
-    CIAO_SwapExecC.cpp
-    CIAO_UpgradeableContextC.cpp
+    CCM_BaseS.cpp
+    CCM_EventS.cpp
+    CCM_ComponentS.cpp
+    SwapExecC.cpp
+    UpgradeableContextC.cpp
     Cookies.cpp
-    ComponentsS.cpp
   }
 
 }
@@ -177,7 +72,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)
+  includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)
 
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
@@ -187,67 +82,43 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
   dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
 
   IDL_Files {
-    idlflags += -SS -Sci
-    Deployment_Packaging_Data.idl
-    Deployment_Target_Data.idl
-  }
-
-  IDL_Files {
-    idlflags += -SS
+    NodeApplication_CallBack.idl
+    Deployment_Core.idl
     Deployment_Base.idl
-    Deployment_Connection.idl
     Deployment_Data.idl
-    Deployment_DeploymentPlan.idl
-    Deployment_TargetData.idl
-    Deployment_Events.idl
-    CIAO_ServerResources.idl
-  }
-
-  IDL_Files {
-    Deployment_TargetManager.idl
-    CIAO_NodeApplication_CallBack.idl
-    Deployment_Core.idl
-    Deployment_NodeApplication.idl
-    Deployment_Application.idl
-    Deployment_Container.idl
+    Packaging_Data.idl
+    Target_Data.idl
     Deployment.idl
-    Deployment_NodeManager.idl
-    Deployment_ApplicationManager.idl
-    Deployment_NodeApplicationManager.idl
-    Deployment_DomainApplicationManager.idl
-    Deployment_ExecutionManager.idl
-    Deployment_RepositoryManager.idl
+    NodeManager.idl
+    NodeApplicationManager.idl
+    DomainApplicationManager.idl
+    ExecutionManager.idl
+    RepositoryManager.idl
+    ServerResources.idl
+    Deployment_Events.idl
   }
 
   Source_Files {
     Deployment_CoreC.cpp
     Deployment_BaseC.cpp
-    Deployment_ConnectionC.cpp
     Deployment_DataC.cpp
-    Deployment_DeploymentPlanC.cpp
-    Deployment_TargetDataC.cpp
-    Deployment_NodeApplicationC.cpp
-    Deployment_ApplicationC.cpp
-    Deployment_ContainerC.cpp
-    Deployment_Packaging_DataC.cpp
-    Deployment_Target_DataC.cpp
+    Packaging_DataC.cpp
+    Target_DataC.cpp
     DeploymentC.cpp
-    Deployment_TargetManagerC.cpp
-    Deployment_NodeManagerC.cpp
-    Deployment_NodeApplicationManagerC.cpp
-    Deployment_ApplicationManagerC.cpp
-    Deployment_DomainApplicationManagerC.cpp
-    Deployment_ExecutionManagerC.cpp
-    Deployment_RepositoryManagerC.cpp
-    CIAO_NodeApplication_CallBackC.cpp
-    CIAO_ServerResourcesC.cpp
+    NodeManagerC.cpp
+    NodeApplicationManagerC.cpp
+    DomainApplicationManagerC.cpp
+    ExecutionManagerC.cpp
+    RepositoryManagerC.cpp
+    NodeApplication_CallBackC.cpp
+    ServerResourcesC.cpp
     Deployment_EventsC.cpp
   }
 }
 
 // CIAO_DnC_Client library must be linked for this project.
 // Please don't remove.
-project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc, naming {
+project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc {
   sharedname   =  CIAO_Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
@@ -256,37 +127,40 @@ 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)
+  includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT)
 
   IDL_Files {
   }
 
   Source_Files {
     Deployment_CoreS.cpp
-    Deployment_ApplicationS.cpp
-    Deployment_NodeApplicationS.cpp
-    Deployment_ContainerS.cpp
+    Deployment_BaseS.cpp
+    Deployment_DataS.cpp
+    Packaging_DataS.cpp
+    Target_DataS.cpp
     DeploymentS.cpp
-    Deployment_RepositoryManagerS.cpp
-    Deployment_NodeManagerS.cpp
-    Deployment_NodeApplicationManagerS.cpp
-    Deployment_ApplicationManagerS.cpp
-    Deployment_DomainApplicationManagerS.cpp
-    Deployment_ExecutionManagerS.cpp
+    RepositoryManagerS.cpp
+    NodeManagerS.cpp
+    NodeApplicationManagerS.cpp
+    DomainApplicationManagerS.cpp
+    ExecutionManagerS.cpp
     NodeApp_CB_Impl.cpp
-    Deployment_TargetManagerS.cpp
-    CIAO_NodeApplication_CallBackS.cpp
+    NodeApplication_CallBackS.cpp
+    ServerResourcesS.cpp
+    Deployment_EventsS.cpp
   }
 
 }
 
-project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security, 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
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
   IDL_Files {
+
   }
 
   Source_Files {