Mon Nov 27 13:10:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 201 insertions, 136 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 480d39f041a..1e4cdf32f37 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,26 @@
+Mon Nov 27 13:10:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment_Core.idl
+        * ciao/Deployment_Container.idl
+        * ciao/Deployment_NodeApplication.idl
+          Moved some interfaces from Core to their own files
+
+        * ciao/CCM_Core.mpc:
+          Updated because of split above and added some more flags to
+          reduce the amount of generated files
+
+        * ciao/DomainApplicationManager.idl:
+        * ciao/NodeApplication_CallBack.idl
+          Updated include
+
+        * DAnCE/NodeApplication/Container_Impl.h:
+        * DAnCENodeApplication/NodeApplication_Impl.h:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client.cpp:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
+          Updated includes because of refactoring above
+
 Mon Nov 27 09:40:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h
index c4a542084df..624fa20d133 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -25,7 +25,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Deployment_CoreS.h"
+#include "ciao/Deployment_ContainerS.h"
+#include "ciao/Deployment_NodeApplicationC.h"
 #include "ciao/Container_Base.h"
 #include "ace/SString.h"
 #include "ciao/Server_init.h"  // write_IOR function & NameUtility
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index ee1878ff07d..610478f0122 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -26,7 +26,7 @@
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "tao/ORB.h"
-#include "ciao/Deployment_CoreS.h"
+#include "ciao/Deployment_NodeApplicationS.h"
 #include "ciao/Server_init.h"
 #include "ciao/CIAO_common.h"
 #include "ciao/Object_Set_T.h"
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index 5db3b205120..a6038303961 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -3,7 +3,7 @@
 // This test tries to install a set of components in 2 different containers, which
 // is hosted in the same NodeApplication.
 
-#include "Deployment_CoreC.h"
+#include "Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
index 41dafda97d7..11a53732939 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Deployment_CoreC.h"
+#include "Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index 8f301a2e643..31e8ee8eb6d 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ciao/Deployment_CoreC.h"
+#include "ciao/Deployment_NodeApplicationC.h"
 #include "ciao/Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index 345b70d309d..7c6f2bd8792 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Deployment_CoreC.h"
+#include "Deployment_NodeApplicationC.h"
 #include "Client_init.h"
 #include "NodeAppTest_RoundTripC.h"
 #include "ace/Get_Opt.h"
diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc
index b8cda16612b..ceb4d9755e7 100644
--- a/CIAO/ciao/CCM_Core.mpc
+++ b/CIAO/ciao/CCM_Core.mpc
@@ -25,19 +25,27 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 
   IDL_Files {
+    idlflags += -Ssi -Sci
+    Components.idl
+  }
+
+  IDL_Files {
     CCM_HomeConfigurator.idl
     CCM_StandardConfigurator.idl
-    CCM_KeylessCCMHome.idl
     CCM_Home.idl
     CCM_Object.idl
+  }
+
+  IDL_Files {
+    idlflags += -Ssi
     CCM_HomeFinder.idl
+    CCM_Configurator.idl
+    CCM_KeylessCCMHome.idl
     CCM_Navigation.idl
     CCM_Receptacle.idl
-    Components.idl
   }
 
   IDL_Files {
-    CCM_Configurator.idl
     CCM_Event.idl
   }
 
@@ -169,7 +177,9 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     TargetManager.idl
     NodeApplication_CallBack.idl
     Deployment_Core.idl
+    Deployment_NodeApplication.idl
     Deployment_Application.idl
+    Deployment_Container.idl
     Deployment.idl
     NodeManager.idl
     NodeApplicationManager.idl
@@ -184,7 +194,9 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     Deployment_ConnectionC.cpp
     Deployment_DataC.cpp
     Deployment_TargetDataC.cpp
+    Deployment_NodeApplicationC.cpp
     Deployment_ApplicationC.cpp
+    Deployment_ContainerC.cpp
     Packaging_DataC.cpp
     Target_DataC.cpp
     DeploymentC.cpp
@@ -219,6 +231,8 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien
   Source_Files {
     Deployment_CoreS.cpp
     Deployment_ApplicationS.cpp
+    Deployment_NodeApplicationS.cpp
+    Deployment_ContainerS.cpp
     DeploymentS.cpp
     RepositoryManagerS.cpp
     NodeManagerS.cpp
diff --git a/CIAO/ciao/Deployment_Container.idl b/CIAO/ciao/Deployment_Container.idl
new file mode 100644
index 00000000000..f3b75b4df96
--- /dev/null
+++ b/CIAO/ciao/Deployment_Container.idl
@@ -0,0 +1,56 @@
+// $Id$
+
+#if !defined (DEPLOYMENT_CONTAINER_IDL)
+#define DEPLOYMENT_CONTAINER_IDL
+
+#include "Deployment_Application.idl"
+#include "Deployment_Core.idl"
+
+// *************** Packaging and Deployment ***************
+module Deployment
+{
+  interface NodeApplication; // Forward decl.
+
+  /// CIAO specific interface, which could deal with installing multiple
+  /// containers into a single NodeApplication.
+  interface Container
+  {
+    readonly attribute ::Deployment::Properties properties;
+
+    /// Get the NodeApplication which created us
+    NodeApplication get_node_application ();
+
+    /// Initialize the container with policies
+    // long init (in ::CORBA::PolicyList policies);
+
+    // NW: The following should be component specific info because the
+    // container has already been created and initialized at this
+    // time.  So there's not much container configuration to be done
+    // at this stage.
+    //@@ The container_impl_info will contain
+    //1 component instance name as the key.
+    //2 dll/so name of the exec
+    //3 entry point of the exec
+    //4 dll/so name of the svnt
+    //5 entry point of the svnt
+    //6 Poosible other configuration for container/home/component
+
+    /// Install all homes and components
+    Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info)
+        raises (UnknownImplId,
+                ImplEntryPointNotFound,
+                InstallationFailure,
+                ::Components::InvalidConfiguration);
+
+    /// Remove all homes and components
+    void remove ()
+      raises (::Components::RemoveFailure);
+
+    /// Remove a component instance
+    void remove_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+  };
+
+  typedef sequence<Container> Containers;
+};
+#endif /* DEPLOYMENT_CONTAINER_IDL */
diff --git a/CIAO/ciao/Deployment_Core.idl b/CIAO/ciao/Deployment_Core.idl
index cbdadb08c93..7d80337093e 100644
--- a/CIAO/ciao/Deployment_Core.idl
+++ b/CIAO/ciao/Deployment_Core.idl
@@ -88,50 +88,6 @@ module Deployment
   //         typeprefix within your altered NodeApplication interface
   //         to prevent interoperability issues.
 
-  interface NodeApplication; // Forward decl.
-  typedef sequence<NodeApplication> NodeApplications;
-
-  /// CIAO specific interface, which could deal with installing multiple
-  /// containers into a single NodeApplication.
-  interface Container
-  {
-    readonly attribute ::Deployment::Properties properties;
-
-    /// Get the NodeApplication which created us
-    NodeApplication get_node_application ();
-
-    /// Initialize the container with policies
-    // long init (in ::CORBA::PolicyList policies);
-
-    // NW: The following should be component specific info because the
-    // container has already been created and initialized at this
-    // time.  So there's not much container configuration to be done
-    // at this stage.
-    //@@ The container_impl_info will contain
-    //1 component instance name as the key.
-    //2 dll/so name of the exec
-    //3 entry point of the exec
-    //4 dll/so name of the svnt
-    //5 entry point of the svnt
-    //6 Poosible other configuration for container/home/component
-
-    /// Install all homes and components
-    Deployment::ComponentInfos install (in ContainerImplementationInfo container_impl_info)
-        raises (UnknownImplId,
-                ImplEntryPointNotFound,
-                InstallationFailure,
-                ::Components::InvalidConfiguration);
-
-    /// Remove all homes and components
-    void remove ()
-      raises (::Components::RemoveFailure);
-
-    /// Remove a component instance
-    void remove_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-  };
-
-  typedef sequence<Container> Containers;
   typedef sequence<CIAO::CIAO_Event_Service> CIAO_Event_Services;
 
   /// CIAO specific extension
@@ -147,86 +103,5 @@ module Deployment
 
   /// CIAO specific extension
   typedef sequence<ESInstallationInfo> ESInstallationInfos;
-
-  interface NodeApplication : Application
-  {
-    readonly attribute ::Deployment::Properties properties;
-
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// @@ Initialize the nodeapplication, so it will know what
-    ///    components it will create and home many of them are
-    ///    there. However the real create action will take place when
-    ///    start launch is called on NodeApplicationManager.
-    long init ();
-
-    /// @@ This operation will be called by NodeApplicationManager
-    ///    client to really start to create homes and components.
-    ComponentInfos install (in NodeImplementationInfo node_impl_info)
-      raises (UnknownImplId,
-              ImplEntryPointNotFound,
-              InstallationFailure,
-              ::Components::InvalidConfiguration,
-              ::Components::RemoveFailure);
-
-    /// CIAO specific extension
-    /// This operation will create one or more CIAO_Event_Service objects
-    /// within the NodeApplication, which will be used to mediate the
-    /// communication of CCM events
-    CIAO_Event_Services install_es (in ESInstallationInfos es_infos)
-      raises (InstallationFailure);
-
-    /// CIAO specific extensions
-    ///@@ We know that Deployment::NodeApplicationManager will be returned,
-    ///   however to avoid the size of the shared object of CIAO_Server.
-    ///   we return an Object.
-    Object get_node_application_manager ();
-
-    /// CIAO specific extension
-    Container create_container (in ::Deployment::Properties properties)
-      raises (::Components::CreateFailure,
-              ::Components::InvalidConfiguration);
-
-    /// CIAO specific extension
-    void remove_container (in Container cref)
-      raises (::Components::RemoveFailure);
-
-    /// CIAO specific extension
-    Containers get_containers ();
-
-    /// CIAO specific extension
-    /// Remove a component instance from the NodeApplication
-    void remove_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-
-    /// CIAO specific extensions
-    /// Activate a component instance from the NodeApplication
-    void activate_component (in string inst_name)
-      raises (::Deployment::StartError);
-
-    /// CIAO specific extensions
-    /// Passivate a component instance from the NodeApplication
-    void passivate_component (in string inst_name)
-      raises (::Components::RemoveFailure);
-
-    /// Remove all containers, components and component homes.
-    /// Shuts down the ORB of the NodeApplication to terminate the process.
-    oneway void remove ();
-
-    /// CIAO specific extension. This will enforce the component to
-    /// be activated (preactivate, activate, postactivated) before the assembly
-    /// is established
-    void ciao_preactivate ()
-      raises (StartError);
-
-    /// CIAO specific extension
-    void ciao_postactivate ()
-      raises (StartError);
-
-    /// CIAO specific extension
-    void ciao_passivate ()
-      raises (StopError);
-  };
-
 };
 #endif /* DEPLOYMENT_CORE_IDL */
diff --git a/CIAO/ciao/Deployment_NodeApplication.idl b/CIAO/ciao/Deployment_NodeApplication.idl
new file mode 100644
index 00000000000..6926ebc975f
--- /dev/null
+++ b/CIAO/ciao/Deployment_NodeApplication.idl
@@ -0,0 +1,96 @@
+// $Id$
+
+#if !defined (DEPLOYMENT_NODEAPPLICATION_IDL)
+#define DEPLOYMENT_NODEAPPLICATION_IDL
+
+#include "Deployment_Application.idl"
+#include "Deployment_Core.idl"
+#include "Deployment_Container.idl"
+
+// *************** Packaging and Deployment ***************
+module Deployment
+{
+  interface NodeApplication : Application
+  {
+    /// CIAO specific extensions
+    readonly attribute ::Deployment::Properties properties;
+
+    /// CIAO specific operation to handle dynamic system redeployment
+    /// and reconfiguration
+    /// @@ Initialize the nodeapplication, so it will know what
+    ///    components it will create and home many of them are
+    ///    there. However the real create action will take place when
+    ///    start launch is called on NodeApplicationManager.
+    long init ();
+
+    /// @@ This operation will be called by NodeApplicationManager
+    ///    client to really start to create homes and components.
+    /// CIAO specific extensions
+    ComponentInfos install (in NodeImplementationInfo node_impl_info)
+      raises (UnknownImplId,
+              ImplEntryPointNotFound,
+              InstallationFailure,
+              ::Components::InvalidConfiguration,
+              ::Components::RemoveFailure);
+
+    /// CIAO specific extension
+    /// This operation will create one or more CIAO_Event_Service objects
+    /// within the NodeApplication, which will be used to mediate the
+    /// communication of CCM events
+    CIAO_Event_Services install_es (in ESInstallationInfos es_infos)
+      raises (InstallationFailure);
+
+    /// CIAO specific extensions
+    ///@@ We know that Deployment::NodeApplicationManager will be returned,
+    ///   however to avoid the size of the shared object of CIAO_Server.
+    ///   we return an Object.
+    Object get_node_application_manager ();
+
+    /// CIAO specific extension
+    Container create_container (in ::Deployment::Properties properties)
+      raises (::Components::CreateFailure,
+              ::Components::InvalidConfiguration);
+
+    /// CIAO specific extension
+    void remove_container (in Container cref)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extension
+    Containers get_containers ();
+
+    /// CIAO specific extension
+    /// Remove a component instance from the NodeApplication
+    void remove_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// CIAO specific extensions
+    /// Activate a component instance from the NodeApplication
+    void activate_component (in string inst_name)
+      raises (::Deployment::StartError);
+
+    /// CIAO specific extensions
+    /// Passivate a component instance from the NodeApplication
+    void passivate_component (in string inst_name)
+      raises (::Components::RemoveFailure);
+
+    /// Remove all containers, components and component homes.
+    /// Shuts down the ORB of the NodeApplication to terminate the process.
+    oneway void remove ();
+
+    /// CIAO specific extension. This will enforce the component to
+    /// be activated (preactivate, activate, postactivated) before the assembly
+    /// is established
+    void ciao_preactivate ()
+      raises (StartError);
+
+    /// CIAO specific extension
+    void ciao_postactivate ()
+      raises (StartError);
+
+    /// CIAO specific extension
+    void ciao_passivate ()
+      raises (StopError);
+  };
+
+};
+#endif /* DEPLOYMENT_CORE_IDL */
diff --git a/CIAO/ciao/DomainApplicationManager.idl b/CIAO/ciao/DomainApplicationManager.idl
index fa21d64d39f..ba4918f097b 100644
--- a/CIAO/ciao/DomainApplicationManager.idl
+++ b/CIAO/ciao/DomainApplicationManager.idl
@@ -3,7 +3,7 @@
 #define DOMAINAPPLICATIONMANAGER_IDL
 
 #include "Deployment.idl"
-#include "Deployment_Core.idl"
+#include "Deployment_NodeApplication.idl"
 
 module Deployment {
   /// CIAO 's DomainApplicationManager interface differs spec-defined interface
diff --git a/CIAO/ciao/NodeApplication_CallBack.idl b/CIAO/ciao/NodeApplication_CallBack.idl
index d0f8daeb42e..01d65b6d8ff 100644
--- a/CIAO/ciao/NodeApplication_CallBack.idl
+++ b/CIAO/ciao/NodeApplication_CallBack.idl
@@ -9,7 +9,7 @@
  * NodeApplication.
  */
 
-#include "Deployment.idl"
+#include "Deployment_NodeApplication.idl"
 #include "NodeApplicationManager.idl"
 
 module CIAO