ChangeLogTag:Wed Feb 7 21:16:36 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu>

23 files changed, 268 insertions, 165 deletions

diff --git a/ciao_core_2/CIAO/ChangeLog b/ciao_core_2/CIAO/ChangeLog
index 19ab96bc8df..b80817dcc8c 100644
--- a/ciao_core_2/CIAO/ChangeLog
+++ b/ciao_core_2/CIAO/ChangeLog
@@ -1,126 +1,40 @@
-Fri Feb  2 15:09:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Container_Base.cpp:
-        * ciao/Context_Impl_Base.cpp:
-        * ciao/Context_Impl_T.cpp:
-        * ciao/Home_Servant_Impl_Base.cpp:
-        * ciao/Home_Servant_Impl_T.cpp:
-        * ciao/Port_Activator_T.cpp:
-        * ciao/Servant_Activator.cpp:
-        * ciao/Servant_Impl_Base.cpp:
-        * ciao/Servant_Impl_T.cpp:
-        * ciao/Swapping_Servant_Home_Impl_Base.cpp:
-        * ciao/Swapping_Servant_Home_Impl_T.cpp:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/NodeApplication/Container_Impl.cpp:
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * docs/templates/CIAO_Glue_Session_Template.cpp:
-        * docs/templates/CIAO_Glue_Session_Template.inl:
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp:
-          Replaced ACE_THROW_RETURN with throw
-
-Fri Feb  2 13:28:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
-        * examples/BasicSP/EC/client.cpp:
-        * performance-tests/Benchmark/RoundTripServer/server.cpp:
-        * performance-tests/Benchmark/server.cpp:
-        * performance-tests/Protocols/Controller/Controller.cpp:
-        * RACE/Input_Adapters/LocationUpdater/Injector.cpp:
-        * RACE/Input_Adapters/PlanGenerator/Injector.cpp:
-        * tests/IDL3/Events/Any/main.cpp:
-        * tools/Config_Handlers/Package_Handlers/test.cpp:
-        * tools/Config_Handlers/RT-CCM/test.cpp:
-        * tools/Config_Handlers/test.cpp:
-          No need anymore to pass an empty string as orbname
-
-Fri Feb  2 11:48:34 UTC 2007  Simon McQueen  <sm@prismtech.com>
-
-        * tests/IDL3/Components/SimpleComponent/SimpleComponent.idl:
-
-          Add regression testing for bug #2790.
-
-Wed Jan 31 15:44:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Plan_Generator/PCVisitor.cpp:
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-        * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
-        * RACE/Controller/Component/Controller_exec.cpp:
-        * RACE/Controller/Component/Controller_exec.h:
-
-Wed Jan 31 15:03:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/DAM_Map.{h,cpp}:
-        * DAnCE/ExecutionManager/Execution_Manager.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.{h,cpp}:
-          Const changes, layout improvements
-
-Tue Jan 30 20:49:50 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-         * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
-         * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp:
-
-           Compile fixes for FC6.
-
-Tue Jan 30 20:43:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-          Changed the check for the bind, with -1 return an error, with
-          1 report a debug message of the reuse, else a normal debug.
-          Thanks to Sandro Andrade <sandro dot andrade at gmail dot com>
-          for reporting that ReDAC was broken.
-
-Tue Jan 30 11:27:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Server_init.{h,cpp}:
-          Change argument of BindObjectPath to a _ptr. Fixes bugzilla
-          2779. Thanks to Abdullah Sowayan <abdullah.sowayan@lmco.com>
-          for reporting this.
-
-Mon Jan 29 19:23:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Swapping_Servant_Home_Impl_Base.{h,cpp}:
-        * ciao/Upgradeable_Context_Impl_T.cpp:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-          Layout changes
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-          Fixed parsing of node manager file
-
-        * examples/BasicSP/descriptors/run_test.pl:
-          New script to run this example automatically
-
-        * exampls/BasicSP/README.html:
-          Fixed incorrect path and mpc generation command
-
-Sun Jan 28 19:59:14 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIAO version 0.5.6 released.
-
-Thu Jan 25 18:18:58 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * *.{h,cpp,inl}:
-
-          Removed the majority of the ACE exception macros.  The
-          ACE_THROW_RETURN's were left in to avoid warnings from aCC.
-
-Wed Jan 24 13:00:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * *.{h,cpp,inl}:
-          Removed part of the environment macros
-
-Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIAO version 0.5.5 released.
-
+Wed Feb  7 21:16:36 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Deployment_Data.idl
+        * ciao/Deployment_ApplicationManager.idl
+        * ciao/CCM_CCMException.idl
+        * ciao/Deployment_Application.idl
+        * ciao/Context_Impl_Base.h
+        * ciao/Deployment.idl
+        * ciao/Context_Impl_Base.cpp
+        * ciao/Deployment_NodeApplication.idl
+        * ciao/Deployment_TargetData.idl
+        * ciao/CCM_Events.idl
+        * ciao/Deployment_ExecutionManager.idl
+        * ciao/Deployment_NodeApplicationManager.idl
+        * ciao/CCM_Context.idl
+        * ciao/Deployment_Base.idl
+        * ciao/Deployment_Packaging_Data.idl
+        * ciao/Deployment_DomainApplicationManager.idl
+        * ciao/Deployment_Connection.idl
+        * ciao/Deployment_TargetManager.idl
+        * ciao/Deployment_DeploymentPlan.idl
+        * ciao/Deployment_NodeManager.idl
+        
+          Updated with changes to comply with the 06-02-01 version of the
+          DnC spec.  Many of these changes would break the entire toolchain,
+          so they are commented out for the time being.  grep for
+
+          @@changed @@add @@delete
+        
+          to find changes.
+          
+        * ciao/CCM_Core.mpc
+        *ciao/Deployment_DomainApplication.idl
+        
+         Added DomainApplication interface, completely missing from our IDL.
+
+        
 
 Local Variables:
 mode: change-log
diff --git a/ciao_core_2/CIAO/ciao/CCM_CCMException.idl b/ciao_core_2/CIAO/ciao/CCM_CCMException.idl
index 850de8f6d48..012f3dd24ff 100644
--- a/ciao_core_2/CIAO/ciao/CCM_CCMException.idl
+++ b/ciao_core_2/CIAO/ciao/CCM_CCMException.idl
@@ -26,11 +26,10 @@ module Components
     DUPLICATE_KEY,
     FIND_ERROR,
     OBJECT_NOT_FOUND,
-    NO_SUCH_ENTITY
-    /* extended by QoS4CCM
+    NO_SUCH_ENTITY,
     QOS_ERROR,
     REGISTRATION_ERROR,
-    SERVICE_INSTALLATION_ERROR */
+    SERVICE_INSTALLATION_ERROR
   };
 
   exception CCMException
diff --git a/ciao_core_2/CIAO/ciao/CCM_Context.idl b/ciao_core_2/CIAO/ciao/CCM_Context.idl
index 52efd23bad0..652a4791724 100644
--- a/ciao_core_2/CIAO/ciao/CCM_Context.idl
+++ b/ciao_core_2/CIAO/ciao/CCM_Context.idl
@@ -34,11 +34,8 @@ module Components
     void set_rollback_only()
       raises (IllegalState);
 
-    /**
-     * @todo Add for QoS4CCM
-     * Object resolve_service_reference(in string service_id)
-     *    raises (CCMException);
-     */
+    Object resolve_service_reference(in string service_id);
+    
   };
 };
 #endif /* CCM_CONTEXT_IDL */
diff --git a/ciao_core_2/CIAO/ciao/CCM_Core.mpc b/ciao_core_2/CIAO/ciao/CCM_Core.mpc
index 5bd4fa487ba..bd3872135fa 100644
--- a/ciao_core_2/CIAO/ciao/CCM_Core.mpc
+++ b/ciao_core_2/CIAO/ciao/CCM_Core.mpc
@@ -215,6 +215,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     Deployment_ApplicationManager.idl
     Deployment_NodeApplicationManager.idl
     Deployment_DomainApplicationManager.idl
+    Deployment_DomainApplication.idl
     Deployment_ExecutionManager.idl
     Deployment_RepositoryManager.idl
   }
@@ -237,6 +238,7 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     Deployment_NodeApplicationManagerC.cpp
     Deployment_ApplicationManagerC.cpp
     Deployment_DomainApplicationManagerC.cpp
+    Deployment_DomainApplicationC.cpp
     Deployment_ExecutionManagerC.cpp
     Deployment_RepositoryManagerC.cpp
     CIAO_NodeApplication_CallBackC.cpp
@@ -272,6 +274,7 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien
     Deployment_NodeApplicationManagerS.cpp
     Deployment_ApplicationManagerS.cpp
     Deployment_DomainApplicationManagerS.cpp
+    Deployment_DomainApplicationS.cpp
     Deployment_ExecutionManagerS.cpp
     NodeApp_CB_Impl.cpp
     Deployment_TargetManagerS.cpp
diff --git a/ciao_core_2/CIAO/ciao/CCM_Events.idl b/ciao_core_2/CIAO/ciao/CCM_Events.idl
index 4abc6ca4115..de0f894daf2 100644
--- a/ciao_core_2/CIAO/ciao/CCM_Events.idl
+++ b/ciao_core_2/CIAO/ciao/CCM_Events.idl
@@ -57,14 +57,9 @@ module Components
     EventConsumerBase get_consumer (in FeatureName sink_name)
       raises (InvalidName);
 
-    /**
-     * @todo Mismatch with 06-04-01, AlreadyConnected is not listed in the
-     * spec with this operation.
-     */
     Cookie subscribe (in FeatureName publisher_name,
                       in EventConsumerBase subscriber)
       raises (InvalidName,
-              AlreadyConnected,
               InvalidConnection,
               ExceededConnectionLimit);
 
diff --git a/ciao_core_2/CIAO/ciao/Context_Impl_Base.cpp b/ciao_core_2/CIAO/ciao/Context_Impl_Base.cpp
index 72d99657c08..a39407866c3 100644
--- a/ciao_core_2/CIAO/ciao/Context_Impl_Base.cpp
+++ b/ciao_core_2/CIAO/ciao/Context_Impl_Base.cpp
@@ -73,7 +73,15 @@ namespace CIAO
   {
     throw CORBA::NO_IMPLEMENT ();
   }
+  
+  CORBA::Object *
+  Context_Impl_Base::resolve_service_reference (const char *service_id)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
 
+  
   // CIAO-specific.
 
   CIAO::Session_Container *
diff --git a/ciao_core_2/CIAO/ciao/Context_Impl_Base.h b/ciao_core_2/CIAO/ciao/Context_Impl_Base.h
index 189a9f3aba2..902b5257ae2 100644
--- a/ciao_core_2/CIAO/ciao/Context_Impl_Base.h
+++ b/ciao_core_2/CIAO/ciao/Context_Impl_Base.h
@@ -93,6 +93,11 @@ namespace CIAO
     set_rollback_only ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
+    
+    virtual CORBA::Object *
+    resolve_service_reference (const char *service_id)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
 
     // CIAO-specific.
 
diff --git a/ciao_core_2/CIAO/ciao/Deployment.idl b/ciao_core_2/CIAO/ciao/Deployment.idl
index 793c44fc853..10d34cbedb1 100644
--- a/ciao_core_2/CIAO/ciao/Deployment.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment.idl
@@ -12,7 +12,23 @@ module Deployment {
     string name;
     string reason;
   };
-
+  
+  // @@added
+  exception InvalidNodeExecParameter {
+    string name;
+    string reason;
+  };
+  
+  // @@added
+  exception InvalidComponentExecParameter {
+    string name;
+    string reason;
+  };
+  
+  // @@added
+  exception LastConfiguration {
+  };
+  
   exception NoSuchName {
   };
 
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Application.idl b/ciao_core_2/CIAO/ciao/Deployment_Application.idl
index df03887cf7d..5f6f728bf09 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_Application.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_Application.idl
@@ -21,6 +21,11 @@ module Deployment
 
   interface Application
   {
+    // @@changed
+    //     void finishLaunch (in Connections providedReference,
+    //                        in boolean start)
+    //       raises (StartError, InvalidConnection);
+    
     void finishLaunch (in Connections providedReference,
                        in boolean start,
                        in boolean is_ReDAC)
diff --git a/ciao_core_2/CIAO/ciao/Deployment_ApplicationManager.idl b/ciao_core_2/CIAO/ciao/Deployment_ApplicationManager.idl
index 98fe247f2f9..f676a91640d 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_ApplicationManager.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_ApplicationManager.idl
@@ -16,10 +16,12 @@ module Deployment {
 
   interface ApplicationManager {
     /// @todo Spec mentions another few exceptions in the raises cluase
+    // @@changed
     Application startLaunch (in Properties configProperty,
                              out Connections providedReference,
                              in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
+      raises (ResourceNotAvailable, StartError, InvalidProperty,
+              InvalidNodeExecParameter, InvalidComponentExecParameter);
     void destroyApplication (in Application app)
       raises (StopError);
   };
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Base.idl b/ciao_core_2/CIAO/ciao/Deployment_Base.idl
index cb98f5d05b6..0ae4a2748f6 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_Base.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_Base.idl
@@ -11,12 +11,14 @@ module Deployment {
     any value;
   };
   typedef sequence < Property > Properties;
-
+  
+  // @@changed element order
   struct Requirement {
-    string resourceType;
     string name;
+    string resourceType;
     Properties property;
   };
+
   typedef sequence < Requirement > Requirements;
 
   enum SatisfierPropertyKind {
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Connection.idl b/ciao_core_2/CIAO/ciao/Deployment_Connection.idl
index 769c331a748..4fe19825a86 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_Connection.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_Connection.idl
@@ -11,7 +11,14 @@ module Deployment
 {
   typedef sequence < Object > Endpoints;
   //typedef Object Endpoint;
-
+  
+  // @@changed
+  // struct Connection
+  //   {
+  //     string name;
+  //     Endpoints endpoint;
+  //   };
+  
   // CIAO's specific <Connection> type defition.
   // To avoid the connection info in the plan being passed to the
   // local node and to make the implementation not very cumbersome
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Data.idl b/ciao_core_2/CIAO/ciao/Deployment_Data.idl
index 0c296a815ba..a8279b2b306 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_Data.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_Data.idl
@@ -10,6 +10,10 @@ module Deployment {
   struct ComponentPackageReference {
     string requiredUUID;
     string requiredName;
+
+    // @@changed
+    //ComponentInterfaceDescription requiredType;
+
     string requiredType;
   };
 
@@ -21,8 +25,9 @@ module Deployment {
     ResourceUsageKinds resourceUsage;
     string resourcePort;
     string componentPort;
-    string resourceType;
+    // @@ changed: order of name and resourceType
     string name;
+    string resourceType;
     Properties property;
   };
 
diff --git a/ciao_core_2/CIAO/ciao/Deployment_DeploymentPlan.idl b/ciao_core_2/CIAO/ciao/Deployment_DeploymentPlan.idl
index e8dbde8ae2b..4173909766f 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_DeploymentPlan.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_DeploymentPlan.idl
@@ -56,7 +56,14 @@ module Deployment {
     string name;
     ::CORBA::StringSeq source;
     ::CORBA::ULongSeq artifactRef;
+    // @@changed 
+    // Properties nodeExecParameter;
     Properties execParameter;
+    
+    // @@added
+    // Properties componentExecParameter;
+    
+    // @@delete:
     Requirements deployRequirement;
   };
 
@@ -72,6 +79,11 @@ module Deployment {
 
   struct InstanceResourceDeploymentDescription {
     ResourceUsageKind resourceUsage;
+    // @@added
+    //string resourcePort;
+    // @@added
+    //string componentPort;
+    
     string requirementName;
     string resourceName;
     Properties property;
@@ -108,6 +120,12 @@ module Deployment {
 
   struct ExternalReferenceEndpoint {
     string location;
+    // @@added
+    // boolean provider;
+    // @@added
+    // string portName;
+    // @@added
+    // ::CORBA::StringSeq supportedType;
   };
 
   typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
@@ -169,12 +187,28 @@ module Deployment {
     string node;
     ::CORBA::StringSeq source;
     Properties execParameter;
+
+    // @@delete:
     Requirements deployRequirement;
+
     ResourceDeploymentDescriptions deployedResource;
   };
 
   typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
-
+  
+  // @@added
+  enum PlanLocalityKind {
+    PlanSameProcess,
+    PlanDifferentProcess,
+    PlanNoConstraint
+  };
+  
+  // @@added
+  struct PlanLocality {
+    PlanLocalityKind constraint;
+    ::CORBA::ULongSeq constrainedInstanceRef;
+  };
+  
   struct DeploymentPlan {
     string label;
     string UUID;
@@ -182,10 +216,12 @@ module Deployment {
     MonolithicDeploymentDescriptions implementation;
     InstanceDeploymentDescriptions instance;
     PlanConnectionDescriptions connection;
-            PlanPropertyMappings externalProperty;
+    PlanPropertyMappings externalProperty;
     ImplementationDependencies dependsOn;
     ArtifactDeploymentDescriptions artifact;
     Properties infoProperty;
+    // @added
+    // PlanLocalities localityConstraint;
   };
 };
 
diff --git a/ciao_core_2/CIAO/ciao/Deployment_DomainApplication.idl b/ciao_core_2/CIAO/ciao/Deployment_DomainApplication.idl
new file mode 100644
index 00000000000..7781907bafe
--- /dev/null
+++ b/ciao_core_2/CIAO/ciao/Deployment_DomainApplication.idl
@@ -0,0 +1,19 @@
+// $Id$
+
+#ifndef DEPLOYMENT_DOMAINAPPLICATION_IDL
+#define DEPLOYMENT_DOMAINAPPLICATION_IDL
+
+#include "Deployment_Application.idl"
+#include "Deployment_Core.idl"
+
+module Deployment
+{
+  // @@added
+  interface DomainApplication : 
+    Application
+  {
+  };
+};
+
+
+#endif
diff --git a/ciao_core_2/CIAO/ciao/Deployment_DomainApplicationManager.idl b/ciao_core_2/CIAO/ciao/Deployment_DomainApplicationManager.idl
index 65b7523959e..d313676ed26 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_DomainApplicationManager.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_DomainApplicationManager.idl
@@ -7,6 +7,14 @@
 #include "ciao/Deployment_ApplicationManager.idl"
 
 module Deployment {
+  // @@changed
+  // interface DomainApplicationManager :
+  //     ApplicationManager
+  //   {
+  //     Applications getApplications ();
+  //     DeploymentPlan getPlan ();
+  //   };
+  
   /// CIAO 's DomainApplicationManager interface differs spec-defined interface
   /// in the same that it also integrates the spec-defined interface for
   /// DomainApplication into itself
diff --git a/ciao_core_2/CIAO/ciao/Deployment_ExecutionManager.idl b/ciao_core_2/CIAO/ciao/Deployment_ExecutionManager.idl
index 39c2ba6053b..710cdd73a48 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_ExecutionManager.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_ExecutionManager.idl
@@ -6,6 +6,17 @@
 #include "ciao/Deployment_DomainApplicationManager.idl"
 
 module Deployment {
+  // @@changed
+  //   interface ExecutionManager
+  //   {
+  //     DomainApplicationManager preparePlan (in DeploymentPlan plan,
+  //                                           in ResourceCommitmentManager resourceCommitment)
+  //       raises (ResourceNotAvailable, PlanError, StartError);
+  //     DomainApplicationManagers getManagers ();
+  //     void destroyManager (in DomainApplicationManager manager)
+  //       raises (StopError);
+  //   };
+  
   interface ExecutionManager {
     /// @todo ResourceCommitmentManger is missing
     DomainApplicationManager preparePlan (in DeploymentPlan plan,
diff --git a/ciao_core_2/CIAO/ciao/Deployment_NodeApplication.idl b/ciao_core_2/CIAO/ciao/Deployment_NodeApplication.idl
index 7c0a0db93b7..f80dda55369 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_NodeApplication.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_NodeApplication.idl
@@ -34,7 +34,12 @@ module Deployment
 
   /// CIAO specific extension
   typedef sequence<ESInstallationInfo> ESInstallationInfos;
-
+  
+  // @@changed
+  //interface NodeApplication : Application
+  //{  
+  //};
+  
   interface NodeApplication : Application
   {
     /// CIAO specific extensions
diff --git a/ciao_core_2/CIAO/ciao/Deployment_NodeApplicationManager.idl b/ciao_core_2/CIAO/ciao/Deployment_NodeApplicationManager.idl
index 32f3f0d21f9..9fc2aa09581 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_NodeApplicationManager.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_NodeApplicationManager.idl
@@ -21,7 +21,12 @@ module Deployment {
     long msec_;
   };
 
-
+  // @@changed:
+  // interface NodeApplicationManager :
+  //     ApplicationManager
+  //   {
+  //   };
+  
   interface NodeApplicationManager :
     ApplicationManager
   {
diff --git a/ciao_core_2/CIAO/ciao/Deployment_NodeManager.idl b/ciao_core_2/CIAO/ciao/Deployment_NodeManager.idl
index e6672764115..45a810b3f30 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_NodeManager.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_NodeManager.idl
@@ -12,7 +12,20 @@ module Deployment {
   };
 
   interface NodeApplicationManager;
-
+  
+  //@@changed
+//   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);
+//     Resources getDynamicResources ();
+//   };
+  
   interface NodeManager {
     /*
      * @todo 06-02-01 mentions a 4th argument:in long updateInterval
diff --git a/ciao_core_2/CIAO/ciao/Deployment_Packaging_Data.idl b/ciao_core_2/CIAO/ciao/Deployment_Packaging_Data.idl
index ed3d0feecb2..d02745195b7 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_Packaging_Data.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_Packaging_Data.idl
@@ -35,11 +35,9 @@ module Deployment
 
   typedef sequence < AssemblyPropertyMapping > AssemblyPropertyMappings;
 
-#ifndef AVOID_IFR_CRASH
   struct NamedImplementationArtifact;
 
   typedef sequence < NamedImplementationArtifact > NamedImplementationArtifacts;
-#endif /* AVOID_IFR_CRASH */
 
   struct ImplementationArtifactDescription {
     string label;
@@ -47,9 +45,7 @@ module Deployment
     ::CORBA::StringSeq location;
     Properties execParameter;
     Requirements deployRequirement;
-#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts dependsOn;
-#endif /* AVOID_IFR_CRASH */
     Properties infoProperty;
   };
 
@@ -57,19 +53,17 @@ module Deployment
     string name;
     ImplementationArtifactDescription referencedArtifact;
   };
-
+  
+  // @@changed: order of members
   struct MonolithicImplementationDescription {
     Properties nodeExecParameter;
-    Properties componentExecParameter;
-#ifndef AVOID_IFR_CRASH
     NamedImplementationArtifacts primaryArtifact;
-#endif /* AVOID_IFR_CRASH */
     ImplementationRequirements deployRequirement;
+    Properties componentExecParameter;
   };
 
   typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
 
-#ifndef AVOID_IFR_CRASH
   struct PackageConfiguration;
 
   typedef sequence < PackageConfiguration > PackageConfigurations;
@@ -77,14 +71,11 @@ module Deployment
   struct ComponentPackageDescription;
 
   typedef sequence < ComponentPackageDescription > ComponentPackageDescriptions;
-#endif /* AVOID_IFR_CRASH */
 
   struct SubcomponentInstantiationDescription {
     string name;
-#ifndef AVOID_IFR_CRASH
     ComponentPackageDescriptions basePackage;
     PackageConfigurations specializedConfig;
-#endif /* AVOID_IFR_CRASH */
     Requirements selectRequirement;
     Properties configProperty;
     ComponentPackageReferences referencedPackage;
@@ -102,11 +93,29 @@ module Deployment
   };
 
   typedef sequence < AssemblyConnectionDescription > AssemblyConnectionDescriptions;
-
+  
+  // @@added
+  enum LocalityKind {
+    SameNodeAnyProcess,
+    SameNodeSameProcess,
+    SameNodeDifferentProcess,
+    DifferentNode,
+    DifferentProcess,
+    NoConstraint
+  };
+  
+  // @@added
+  struct Locality {
+    LocalityKind constraint;
+    ::CORBA::ULongSeq constrainedInstanceRef; 
+  };
+    
   struct ComponentAssemblyDescription {
     SubcomponentInstantiationDescriptions instance;
     AssemblyConnectionDescriptions connection;
     AssemblyPropertyMappings externalProperty;
+    // @@added
+    // Localities localityConstraint;
   };
 
   typedef sequence < ComponentAssemblyDescription > ComponentAssemblyDescriptions;
@@ -145,13 +154,15 @@ module Deployment
   struct PackageConfiguration {
     string label;
     string UUID;
-#ifndef AVOID_IFR_CRASH
-    PackageConfigurations specializedConfig;
     ComponentPackageDescriptions basePackage;
-#endif /* AVOID_IFR_CRASH */
-    ComponentPackageReferences reference;
+    PackageConfigurations specializedConfig;
     Requirements selectRequirement;
     Properties configProperty;
+    ComponentPackageReferences reference;
+    // @@changed, delete previous
+    //ComponentPackageReferences referencedPackage;
+    // @@add
+    ComponentPackageImports importedPackage;
   };
 
 
diff --git a/ciao_core_2/CIAO/ciao/Deployment_TargetData.idl b/ciao_core_2/CIAO/ciao/Deployment_TargetData.idl
index 82cff14ca83..049c04f95b8 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_TargetData.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_TargetData.idl
@@ -14,6 +14,7 @@ module Deployment {
     ::CORBA::StringSeq resourceType;
     SatisfierProperties property;
   };
+
   typedef sequence < Resource > Resources;
 
   struct SharedResource {
diff --git a/ciao_core_2/CIAO/ciao/Deployment_TargetManager.idl b/ciao_core_2/CIAO/ciao/Deployment_TargetManager.idl
index 78723ab3b3d..7eb1ccc0412 100644
--- a/ciao_core_2/CIAO/ciao/Deployment_TargetManager.idl
+++ b/ciao_core_2/CIAO/ciao/Deployment_TargetManager.idl
@@ -16,21 +16,57 @@ module Deployment {
     Add,
     Delete,
     UpdateAll,
-    UpdateAvailable
+    // @@changed
+    UpdateDynamic
   };
 
   /**
    * @todo The ResourceCommitmentManager is part of 06-04-01 and this is not
    * part of the Target Manager yet
    */
+//   // @@add for conformance to 06-02-01
+//   struct ResourceAllocation {
+//     string elementName;
+//     string resourceName;
+//     Properties property;
+//   };
+  
+//   // @@added for conformance to 06-02-01
+//   exception ResourceCommitmentFailure {
+//     string reason;
+//     long index;
+//     string propertyName;
+//     ::CORBA::AnySeq propertyValue;
+//   };
+  
+//   // @@added for conformance to 06-02-01
+//   interface ResourceCommitmentManager {    
+//     void commitResources (in ResourceAllocations resources)
+//       raises (ResourceCommitmentFailure);
+
+//     void releaseResources (in ResourceAllocations resources)
+//       raises (ResourceCommitmentFailure);
+//   };
+  
   interface TargetManager {
     Domain getAllResources ();
     Domain getAvailableResources ();
     /// @todo 06-04-01 specifies this differently
     void commitResources (in DeploymentPlan plan)
       raises (ResourceNotAvailable, PlanError);
+    
+    // @@changed
+    //     ResourceCommitmentManager commitResources (in ResourceAllocations
+    //                                                resources)
+    //       raises (ResourceCommitmentFailure);
+    
+    // @@added
+    // void destroyResourceCommitment (in ResourceCommitmentManager manager);
+
     /// @todo This is not part of 06-04-01
+    // @@delete:
     void releaseResources (in DeploymentPlan argname);
+
     void updateDomain (in ::CORBA::StringSeq elements,
                        in Domain domainSubset,
                        in DomainUpdateKind updateKind);