Thu Apr 29 11:26:18 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/NodeApplication/NodeApplication_Impl.h:
          Removed not needed include

        * ccm/CCM_CCM2Context.idl:
          Updated includes

        * ccm/CCM_EventConsumerBase.idl:
        * ccm/CCM_ExecutorLocator.idl:
          Check for compliancy and list the section from the OMG specification

        * ccm/CCM_lem_stub.mpc:
        * ccm/CCM_stub.mpc:
        * ccm/CCM_svnt.mpc:
          Updated for removed files

        * ccm/Components.idl:
          Updated includes

        * ciao/ComponentServer/Server_init.cpp:
        * ciao/Containers/Container_Base.h:
          Removed not needed include

        * ciao/Containers/Session/Session_Container.h:
          Added needed includes

        * ciao/Servants/Connector_Servant_Impl_Base.h:
          Updated includes

        * connectors/dds4ccm/impl/dds/DataReaderListener.cpp:
          Docu change

        * ccm/CCM_Component.idl:
        * ccm/CCM_Container.idl:
        * ccm/CCM_Container_Ex.idl:
          Removed these files, IDL compiler now generates more specific includes

17 files changed, 46 insertions, 54 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e837f75fdb7..08ec8802cd1 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,41 @@
+Thu Apr 29 11:26:18 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.h:
+          Removed not needed include
+
+        * ccm/CCM_CCM2Context.idl:
+          Updated includes
+
+        * ccm/CCM_EventConsumerBase.idl:
+        * ccm/CCM_ExecutorLocator.idl:
+          Check for compliancy and list the section from the OMG specification
+
+        * ccm/CCM_lem_stub.mpc:
+        * ccm/CCM_stub.mpc:
+        * ccm/CCM_svnt.mpc:
+          Updated for removed files
+
+        * ccm/Components.idl:
+          Updated includes
+
+        * ciao/ComponentServer/Server_init.cpp:
+        * ciao/Containers/Container_Base.h:
+          Removed not needed include
+
+        * ciao/Containers/Session/Session_Container.h:
+          Added needed includes
+
+        * ciao/Servants/Connector_Servant_Impl_Base.h:
+          Updated includes
+
+        * connectors/dds4ccm/impl/dds/DataReaderListener.cpp:
+          Docu change
+
+        * ccm/CCM_Component.idl:
+        * ccm/CCM_Container.idl:
+        * ccm/CCM_Container_Ex.idl:
+          Removed these files, IDL compiler now generates more specific includes
+
 Wed Apr 28 19:13:54 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/impl/dds/DataReader_T.cpp:
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index 615f2942fff..f7a116deff1 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -23,7 +23,6 @@
 #include "tao/ORB.h"
 #include "tao/Object.h"
 #include "ccm/CCM_KeylessCCMHomeC.h"
-#include "ccm/ComponentsC.h"
 #include "ciao/ComponentServer/CIAO_ServerActivator_Impl.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
 
diff --git a/CIAO/ccm/CCM_CCM2Context.idl b/CIAO/ccm/CCM_CCM2Context.idl
index 584d63352d4..2ca24a48ca0 100644
--- a/CIAO/ccm/CCM_CCM2Context.idl
+++ b/CIAO/ccm/CCM_CCM2Context.idl
@@ -4,7 +4,7 @@
 #if !defined (CCM_2CONTEXT_IDL)
 #define CCM_2CONTEXT_IDL
 
-#include "ccm/CCM_Container.idl"
+#include "ccm/CCM_Context.idl"
 #include "ccm/CCM_HomeRegistration.idl"
 #include <CosPersistentState.idl>
 
diff --git a/CIAO/ccm/CCM_Component.idl b/CIAO/ccm/CCM_Component.idl
deleted file mode 100644
index a579496685f..00000000000
--- a/CIAO/ccm/CCM_Component.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#if !defined (CCM_COMPONENT_IDL)
-#define CCM_COMPONENT_IDL
-
-#include "ccm/CCM_Events.idl"
-#include "ccm/CCM_Home.idl"
-#include "ccm/CCM_Object.idl"
-#include "ccm/CCM_Enumeration.idl"
-
-#endif /* CCM_COMPONENT_IDL */
diff --git a/CIAO/ccm/CCM_Container.idl b/CIAO/ccm/CCM_Container.idl
deleted file mode 100644
index fdefcc1e0f9..00000000000
--- a/CIAO/ccm/CCM_Container.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINER_IDL)
-#define CCM_CONTAINER_IDL
-
-#include "ccm/CCM_Component.idl"
-#include "ccm/CCM_CCMException.idl"
-#include "ccm/CCM_HomeExecutorBase.idl"
-#include "ccm/CCM_SessionContext.idl"
-#include "ccm/CCM_SessionComponent.idl"
-
-#endif /* CCM_CONTAINER_IDL */
diff --git a/CIAO/ccm/CCM_Container_Ex.idl b/CIAO/ccm/CCM_Container_Ex.idl
deleted file mode 100644
index 8a64c1c5679..00000000000
--- a/CIAO/ccm/CCM_Container_Ex.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINER_EX_IDL)
-#define CCM_CONTAINER_EX_IDL
-
-#include "ccm/CCM_Container.idl"
-#include "ccm/CCM_Session2Context.idl"
-#include "ccm/CCM_EntityContext.idl"
-
-#endif /* CCM_CONTAINER_EX_IDL */
diff --git a/CIAO/ccm/CCM_EventConsumerBase.idl b/CIAO/ccm/CCM_EventConsumerBase.idl
index 6a1f404eb52..6e1b8c74878 100644
--- a/CIAO/ccm/CCM_EventConsumerBase.idl
+++ b/CIAO/ccm/CCM_EventConsumerBase.idl
@@ -1,4 +1,5 @@
 // $Id$
+/// Compliant with OMG 06-04-01 Section 6.6.2
 
 #if !defined (CCM_EVENTCONSUMERBASE_IDL)
 #define CCM_EVENTCONSUMERBASE_IDL
diff --git a/CIAO/ccm/CCM_ExecutorLocator.idl b/CIAO/ccm/CCM_ExecutorLocator.idl
index c0e914c350d..e6c2bfb6fe2 100644
--- a/CIAO/ccm/CCM_ExecutorLocator.idl
+++ b/CIAO/ccm/CCM_ExecutorLocator.idl
@@ -1,4 +1,5 @@
 // $Id$
+/// Compliant with OMG 06-04-01 Section 8.3.2
 
 #if !defined (CCM_EXECUTORLOCATOR_IDL)
 #define CCM_EXECUTORLOCATOR_IDL
diff --git a/CIAO/ccm/CCM_lem_stub.mpc b/CIAO/ccm/CCM_lem_stub.mpc
index ec57676bf59..686e246cee4 100644
--- a/CIAO/ccm/CCM_lem_stub.mpc
+++ b/CIAO/ccm/CCM_lem_stub.mpc
@@ -21,7 +21,6 @@ project(CCM_lem_stub_idl) : ciaolib_with_idl, valuetype {
 
   IDL_Files {
     idlflags += -SS
-    CCM_Container.idl
     CCM_EnterpriseComponent.idl
     CCM_HomeExecutorBase.idl
     CCM_SessionContext.idl
@@ -41,7 +40,6 @@ project(CCM_lem_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client {
 
   Source_Files {
     CCM_CCMExceptionC.cpp
-    CCM_ContainerC.cpp
     CCM_ContextC.cpp
     CCM_EnterpriseComponentC.cpp
     CCM_HomeExecutorBaseC.cpp
diff --git a/CIAO/ccm/CCM_stub.mpc b/CIAO/ccm/CCM_stub.mpc
index aa7134f472a..bf4a42933ce 100644
--- a/CIAO/ccm/CCM_stub.mpc
+++ b/CIAO/ccm/CCM_stub.mpc
@@ -9,7 +9,6 @@ project(CCM_stub_idl) : ciaolib_with_idl, valuetype {
   IDL_Files {
     idlflags += -SS -Sci
     CCM_Base.idl
-    CCM_Component.idl
     CCM_Exceptions.idl
   }
 
@@ -63,7 +62,6 @@ project(CCM_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client {
     CCM_EventsC.cpp
     CCM_EventBaseC.cpp
     CCM_EventConsumerBaseC.cpp
-    CCM_ComponentC.cpp
     CCM_EnumerationC.cpp
     CCM_HomeC.cpp
     CCM_HomesC.cpp
diff --git a/CIAO/ccm/CCM_svnt.mpc b/CIAO/ccm/CCM_svnt.mpc
index d42b7f07e8b..72371b28ea7 100644
--- a/CIAO/ccm/CCM_svnt.mpc
+++ b/CIAO/ccm/CCM_svnt.mpc
@@ -17,7 +17,6 @@ project(CCM_svnt_idl) : ciaolib_with_idl, valuetype {
     CCM_Session2Context.idl
     CCM_Transaction.idl
     CosPersistentState.idl
-    CCM_Container_Ex.idl
     CCM_StateIdFactory.idl
     CCM_Entity2Context.idl
     CCM_ComponentId.idl
@@ -47,7 +46,6 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \
     CCM_TransactionC.cpp
     CosPersistentStateC.cpp
     CCM_SessionSynchronizationC.cpp
-    CCM_Container_ExC.cpp
     CCM_StateIdFactoryC.cpp
     CCM_ComponentIdC.cpp
     CCM_Entity2ContextC.cpp
@@ -72,7 +70,6 @@ project(CCM_svnt) : orbsvcslib, orbsvcs_output \
     CCM_HomeFinderS.cpp
     CCM_NavigationS.cpp
     CCM_ReceptacleS.cpp
-    ComponentsS.cpp
   }
 }
 
diff --git a/CIAO/ccm/Components.idl b/CIAO/ccm/Components.idl
index cda791f25fa..5ac799a476e 100644
--- a/CIAO/ccm/Components.idl
+++ b/CIAO/ccm/Components.idl
@@ -1,14 +1,9 @@
 // $Id$
 
-/**
- * This file is included in the generated executor
- * mapping IDL file,
- */
-
 #if !defined (CCM_COMPONENTS_IDL)
 #define CCM_COMPONENTS_IDL
 
-#include "ccm/CCM_Component.idl"
+#include "ccm/CCM_Events.idl"
 #include "ccm/CCM_KeylessCCMHome.idl"
 #include "ccm/CCM_Home.idl"
 #include "ccm/CCM_Object.idl"
diff --git a/CIAO/ciao/ComponentServer/Server_init.cpp b/CIAO/ciao/ComponentServer/Server_init.cpp
index 6f5c6b54caf..bb4d0f514ad 100644
--- a/CIAO/ciao/ComponentServer/Server_init.cpp
+++ b/CIAO/ciao/ComponentServer/Server_init.cpp
@@ -2,7 +2,6 @@
 
 #include "Server_init.h"
 
-#include <ccm/CCM_ComponentC.h>
 #include <ccm/CCM_StandardConfiguratorC.h>
 #include "ciao/Valuetype_Factories/Cookies.h"
 #include "ciao/Logger/Log_Macros.h"
diff --git a/CIAO/ciao/Containers/Container_Base.h b/CIAO/ciao/Containers/Container_Base.h
index bd0d5510c9b..7e258a287d0 100644
--- a/CIAO/ciao/Containers/Container_Base.h
+++ b/CIAO/ciao/Containers/Container_Base.h
@@ -27,8 +27,6 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "tao/LocalObject.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "ccm/CCM_ContainerC.h"
-
 #include "ciao/Containers/Container_BaseC.h"
 
 namespace CIAO
diff --git a/CIAO/ciao/Containers/Session/Session_Container.h b/CIAO/ciao/Containers/Session/Session_Container.h
index 1300d604e82..b25975389d5 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.h
+++ b/CIAO/ciao/Containers/Session/Session_Container.h
@@ -26,6 +26,8 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 #include "ciao/Containers/Container_Base.h"
+#include "ccm/CCM_HomeExecutorBaseC.h"
+#include "ccm/CCM_EnterpriseComponentC.h"
 
 namespace CIAO
 {
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
index 97fe854d0f7..fd348c9a1fa 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.h
@@ -27,8 +27,7 @@
 #include "Home_Servant_Impl_Base.h"
 
 #include "ciao/Containers/CIAO_Servant_ActivatorC.h"
-
-#include "ccm/CCM_ContainerC.h"
+#include "ccm/CCM_SessionComponentC.h"
 #include "ccm/CCM_ObjectS.h"
 #include "ccm/CCM_StandardConfiguratorC.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp
index 7491e0dcf29..47dbb3ad855 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp
@@ -32,7 +32,7 @@ namespace CIAO
       ::DDSDataReader * the_reader)
     {
       DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::get_datareader_proxy");
-      //Retrieve the pointer to the proxy from the QoS
+      // Retrieve the pointer to the proxy from the QoS
       ::DDS_DataReaderQos qos;
       the_reader->get_qos (qos);
       DDS_Property_t * prop =