Tue Nov 25 15:55:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

16 files changed, 83 insertions, 38 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 2c9e4b123e9..7e6dac02146 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,38 @@
+Tue Nov 25 15:55:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ccm/ComponentServer/CCM_ComponentServer.idl:
+        * ccm/ComponentServer/CCM_ComponentServer.mpc:
+        * ccm/ComponentServer/CCM_ComponentServer_Base.idl:
+        * ccm/ComponentServer/CCM_ComponentServer_Client.idl:
+        * ccm/ComponentServer/ComponentServer.idl:
+        * ccm/ComponentServer/ComponentServer.mpc:
+        * ccm/ComponentServer/ComponentServer_Base.idl:
+        * ccm/ComponentServer/ComponentServer_Client.idl:
+          Renamed with CCM prefix
+
+        * ccm/CCM_Enumeration.idl:
+        * ccm/CCM_Object.idl:
+          Moved sequence<CCMObject> CCMObjectSeq to CCM_Object
+
+        * ciao/ComponentServer/CIAO_ComponentServer.idl:
+          Use CCMObjectSeq
+
+        * ciao/ComponentServer/CIAO_Container_Impl.cpp:
+        * ciao/ComponentServer/CIAO_Container_Impl.h:
+          Use CCMObjectSeq
+
+        * ciao/ComponentServer/CIAO_CS_Client.idl:
+        * ciao/Containers/Session/Session_Container.cpp:
+        * DAnCE/NodeApplication/NodeApplication_Impl.h:
+        * ofccm/Cdmw/CDMW_IDL.idl
+          Updated include
+
+        * examples/Swapping/Sender/Sender.mpc:
+          Disabled these projects
+
+        * ciao/ComponentServer/CIAO_ComponentServer.mpc:
+          Explicitly list export header files
+
 Tue Nov 25 14:30:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ccm/ComponentServer/ComponentServer.mpc:
diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index 32199a4d9e8..4bc3246d3a2 100644
--- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -29,7 +29,7 @@
 #include "ciao/ComponentServer/CIAO_ServerActivator_Impl.h"
 //#include "Cdmw/CDMW_IDLC.h"
 
-#include "ComponentServer/ComponentServerC.h"
+#include "ccm/ComponentServer/CCM_ComponentServerC.h"
 #include "Deployment/Deployment_NodeApplicationS.h"
 #include "Deployment/Deployment_DeploymentPlanC.h"
 #include "Deployment/DeploymentC.h"
diff --git a/flat/CIAO/ccm/CCM_Enumeration.idl b/flat/CIAO/ccm/CCM_Enumeration.idl
index 29d0280d352..c47c23b6347 100644
--- a/flat/CIAO/ccm/CCM_Enumeration.idl
+++ b/flat/CIAO/ccm/CCM_Enumeration.idl
@@ -17,8 +17,6 @@ module Components
     CCMObject next_element();
   };
 
-  typedef sequence<CCMObject> CCMObjectSeq;
-
   valuetype DefaultEnumeration : Enumeration
   {
     private CCMObjectSeq objects;
diff --git a/flat/CIAO/ccm/CCM_Object.idl b/flat/CIAO/ccm/CCM_Object.idl
index 99d8062f6ad..fd9e66ced21 100644
--- a/flat/CIAO/ccm/CCM_Object.idl
+++ b/flat/CIAO/ccm/CCM_Object.idl
@@ -50,5 +50,6 @@ module Components
       raises (RemoveFailure);
     ComponentPortDescription get_all_ports ();
   };
+  typedef sequence<CCMObject> CCMObjectSeq;
 };
 #endif /* CCM_OBJECT_IDL */
diff --git a/flat/CIAO/ccm/ComponentServer/ComponentServer.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl
index 0fad64a0b09..bbcb1da0c79 100644
--- a/flat/CIAO/ccm/ComponentServer/ComponentServer.idl
+++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.idl
@@ -3,7 +3,7 @@
 #if !defined (COMPONENTSERVER_IDL)
 #define COMPONENTSERVER_IDL
 
-#include "ComponentServer_Base.idl"
+#include "ccm/ComponentServer/CCM_ComponentServer_Base.idl"
 
 module Components
 {
@@ -32,6 +32,8 @@ module Components
       void remove() raises (::Components::RemoveFailure);
     };
 
+    typedef sequence<ComponentServer> ComponentServers;
+
     interface Container
     {
       readonly attribute ConfigValues configuration;
diff --git a/flat/CIAO/ccm/ComponentServer/ComponentServer.mpc b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
index be25b8fa30f..63bb1af3f8b 100644
--- a/flat/CIAO/ccm/ComponentServer/ComponentServer.mpc
+++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer.mpc
@@ -10,9 +10,9 @@ project(CCM_ComponentServer_IDL) : taoidldefaults, anytypecode {
   custom_only = 1
 
   IDL_Files {
-    ComponentServer.idl
-    ComponentServer_Base.idl
-    ComponentServer_Client.idl
+    CCM_ComponentServer.idl
+    CCM_ComponentServer_Base.idl
+    CCM_ComponentServer_Client.idl
   }
 }
 
@@ -22,15 +22,15 @@ project(CCM_ComponentServer_stub) : taolib_with_idl, tao_output, messaging, ccm_
 
   Header_Files {
     DAnCE_ComponentServer_stub_export.h
-    ComponentServerC.h
-    ComponentServer_ClientC.h
-    ComponentServer_BaseC.h
+    CCM_ComponentServerC.h
+    CCM_ComponentServer_ClientC.h
+    CCM_ComponentServer_BaseC.h
   }
 
   Source_Files {
-    ComponentServerC.cpp
-    ComponentServer_ClientC.cpp
-    ComponentServer_BaseC.cpp
+    CCM_ComponentServerC.cpp
+    CCM_ComponentServer_ClientC.cpp
+    CCM_ComponentServer_BaseC.cpp
   }
   IDL_Files {
   }
@@ -41,15 +41,15 @@ project(CCM_ComponentServer_svnt) : taolib_with_idl, tao_output, messaging, ccm_
 
   Header_Files {
     DAnCE_ComponentServer_svnt_export.h
-    ComponentServerS.h
-    ComponentServer_ClientS.h
-    ComponentServer_BaseS.h
+    CCM_ComponentServerS.h
+    CCM_ComponentServer_ClientS.h
+    CCM_ComponentServer_BaseS.h
   }
 
   Source_Files {
-    ComponentServerS.cpp
-    ComponentServer_ClientS.cpp
-    ComponentServer_BaseS.cpp
+    CCM_ComponentServerS.cpp
+    CCM_ComponentServer_ClientS.cpp
+    CCM_ComponentServer_BaseS.cpp
   }
   IDL_Files {
   }
diff --git a/flat/CIAO/ccm/ComponentServer/ComponentServer_Base.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl
index dceeeeac6e4..dceeeeac6e4 100644
--- a/flat/CIAO/ccm/ComponentServer/ComponentServer_Base.idl
+++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Base.idl
diff --git a/flat/CIAO/ccm/ComponentServer/ComponentServer_Client.idl b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl
index a2b13a1cdfe..29b2285ecc5 100644
--- a/flat/CIAO/ccm/ComponentServer/ComponentServer_Client.idl
+++ b/flat/CIAO/ccm/ComponentServer/CCM_ComponentServer_Client.idl
@@ -6,7 +6,7 @@
 #ifndef COMPONENTSERVER_CLIENT_IDL_
 #define COMPONENTSERVER_CLIENT_IDL_
 
-#include "ComponentServer_Base.idl"
+#include "ccm/ComponentServer/CCM_ComponentServer.idl"
 
 module Components
 {
@@ -14,20 +14,17 @@ module Components
 
   module Deployment
   {
-    interface ComponentServer;
-    typedef sequence<ComponentServer> ComponentServers;
-    
     interface ComponentInstallation
     {
       void install(in UUID implUUID, in Location component_loc)
 	raises (InvalidLocation, InstallationFailure);
-      
+
       void replace(in UUID implUUID, in Location component_loc)
 	raises (InvalidLocation, InstallationFailure);
-      
+
       void remove(in UUID implUUID)
 	raises (UnknownImplId, RemoveFailure);
-      
+
       Location get_implementation(in UUID implUUID)
 	raises(UnknownImplId, InstallationFailure);
     };
@@ -35,12 +32,12 @@ module Components
     interface ServerActivator
     {
       ComponentServer create_component_server(in ConfigValues config)
-	raises(::Components::CreateFailure, 
+	raises(::Components::CreateFailure,
 	       ::Components::Deployment::InvalidConfiguration);
-      
+
       void remove_component_server(in ComponentServer server)
 	raises(::Components::RemoveFailure);
-      
+
       ComponentServers get_component_servers();
     };
   };
diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl b/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl
index 0250cf48817..883c87450d3 100644
--- a/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl
+++ b/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl
@@ -9,7 +9,7 @@
 #ifndef CIAO_COMPONENTSERVER_IDL_
 #define CIAO_COMPONENTSERVER_IDL_
 
-#include <ccm/ComponentServer/ComponentServer_Client.idl>
+#include <ccm/ComponentServer/CCM_ComponentServer_Client.idl>
 
 module CIAO
 {
diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl
index 19e633a9cd2..95750dd486e 100644
--- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl
+++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl
@@ -10,7 +10,7 @@
 #define CIAO_COMPONENTSERVER_IDL_
 
 #include <ccm/CCM_Object.idl>
-#include <ccm/ComponentServer/ComponentServer.idl>
+#include <ccm/ComponentServer/CCM_ComponentServer.idl>
 
 module CIAO
 {
@@ -21,8 +21,6 @@ module CIAO
       oneway void shutdown ();
     };
 
-    typedef sequence< ::Components::CCMObject> CCMObjects;
-    
     exception InvalidComponent 
     {
     };
@@ -61,7 +59,7 @@ module CIAO
         raises (::Components::RemoveFailure);
 	
       /// Returns a sequence of all homeless components.
-      CCMObjects get_components ();
+	  ::Components::CCMObjectSeq get_components ();
     };
   };
 };
diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
index 231e110a33a..ef697eba79c 100644
--- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
+++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc
@@ -39,6 +39,9 @@ project(CIAO_ComponentServer_stub) : ccm_componentserver_stub, taolib_with_idl,
     CIAO_ServerResourcesC.cpp
     CIAO_PropertiesC.cpp
   }
+  Header_Files {
+    CIAO_ComponentServer_stub_export.h
+  }
 }
 
 project(CIAO_CS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \
@@ -54,6 +57,7 @@ project(CIAO_CS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_componen
   Header_Files {
     CIAO_ServerActivator_Impl.h
     CIAO_CS_ClientS.h
+    CIAO_CS_Client_svnt_export.h
   }
 }
 
@@ -73,6 +77,9 @@ project(CIAO_ComponentServer_svnt) : ccm_componentserver_svnt, ciao_componentser
      CIAO_Container_Impl.cpp
      Configurator_Factory.cpp
   }
+  Header_Files {
+    CIAO_ComponentServer_svnt_export.h
+  }
 }
 
 project(CIAO_ComponentServer_exe) : ccm_componentserver_svnt, portableserver, ciao_componentserver_svnt, \
diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp
index e4a62af4638..6ba1a6b5cda 100644
--- a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp
+++ b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp
@@ -78,7 +78,7 @@ namespace CIAO
       throw CORBA::NO_IMPLEMENT ();
     }
 
-    ::CIAO::Deployment::CCMObjects *
+    ::Components::CCMObjectSeq *
     CIAO_Container_i::get_components (void)
     {
       CIAO_TRACE("CIAO_Container_i::get_components");
diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
index 256ab02d8e4..85b6576ad89 100644
--- a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
+++ b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h
@@ -46,7 +46,7 @@ namespace CIAO
 
       virtual void remove_component (::Components::CCMObject_ptr cref);
 
-      virtual ::CIAO::Deployment::CCMObjects * get_components (void);
+      virtual ::Components::CCMObjectSeq * get_components (void);
 
       virtual ::Components::ConfigValues * configuration (void);
 
diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp
index fa8855c5f24..dbdc4996224 100644
--- a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp
+++ b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp
@@ -5,7 +5,7 @@
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "ciao/CIAO_common.h"
 #include "ciao/Containers/Servant_Activator.h"
-#include "ccm/ComponentServer/ComponentServer_BaseC.h"
+#include "ccm/ComponentServer/CCM_ComponentServer_BaseC.h"
 #include "ciao/ComponentServer/CIAO_ComponentServerC.h"
 #include "ciao/Servants/Servant_Impl_Base.h"
 
diff --git a/flat/CIAO/examples/Swapping/Sender/Sender.mpc b/flat/CIAO/examples/Swapping/Sender/Sender.mpc
index f47d21f2e09..70fefa3bb62 100644
--- a/flat/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/flat/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
 project(Swapping_Hello_Sender_idl_gen) : taoidldefaults, anytypecode {
+  requires += dummy_label              
   avoids += ace_for_tao
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -35,6 +36,7 @@ project(Swapping_Hello_Sender_cidl_gen) : ciaocidldefaults, taoidldefaults {
 }
 
 project(Swapping_Hello_Sender_stub): ccm_stub {
+  requires += dummy_label              
   avoids += ace_for_tao
   after += Swapping_Hello_Base_stub \
            Swapping_Hello_Sender_idl_gen
@@ -60,6 +62,7 @@ project(Swapping_Hello_Sender_stub): ccm_stub {
 }
 
 project(Swapping_Hello_Sender_svnt) : ciao_servant {
+  requires += dummy_label              
   avoids += ace_for_tao
   after += Swapping_Hello_Base_skel \
            Swapping_Hello_Sender_stub \
@@ -97,6 +100,7 @@ project(Swapping_Hello_Sender_svnt) : ciao_servant {
 }
 
 project(Swapping_Hello_Sender_exec) : ciao_executor {
+  requires += dummy_label              
   avoids += ace_for_tao
   after   += Swapping_Hello_Sender_svnt
   sharedname = Swapping_Sender_exec
@@ -121,6 +125,7 @@ project(Swapping_Hello_Sender_exec) : ciao_executor {
 }
 
 project(Swapping_Hello_Sender_exec_1) : ciao_executor {
+  requires += dummy_label              
   avoids += ace_for_tao
   after   += Swapping_Hello_Sender_exec
   sharedname = Swapping_Sender_exec_1
@@ -146,6 +151,7 @@ project(Swapping_Hello_Sender_exec_1) : ciao_executor {
 }
 
 project(Swapping_Hello_Sender_exec_2) : ciao_executor {
+  requires += dummy_label              
   avoids += ace_for_tao
   after   += Swapping_Hello_Sender_exec
   sharedname = Swapping_Sender_exec_2
@@ -174,6 +180,7 @@ project(Swapping_Hello_Sender_exec_2) : ciao_executor {
 }
 
 project (Swapping_Hello_Starter) : ccm_stub, valuetype {
+  requires += dummy_label              
   avoids += ace_for_tao
   exename = Upgradeable_starter
   after += Swapping_Hello_Sender_stub
diff --git a/flat/CIAO/ofccm/Cdmw/CDMW_IDL.idl b/flat/CIAO/ofccm/Cdmw/CDMW_IDL.idl
index 759221ce738..07b16f43513 100644
--- a/flat/CIAO/ofccm/Cdmw/CDMW_IDL.idl
+++ b/flat/CIAO/ofccm/Cdmw/CDMW_IDL.idl
@@ -19,7 +19,7 @@
 #include "ccm/CCM_Navigation.idl"
 #include "ccm/CCM_StandardConfigurator.idl"
 
-#include "ccm/ComponentServer/ComponentServer_Client.idl"
+#include "ccm/ComponentServer/CCM_ComponentServer_Client.idl"
 
 module Components
 {