Sun Nov 27 18:19:18 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        Merging in another set of changes. The skeletons got refactored even
        more and now the S.inl files are not generated anymore. For CIAO
        we now generate the facet servants in new _svnt_T.{h,cpp} files, which
        is the first step in a major refactoring and simplification of the
        CCM servants which is also a first step in the direction of a Common
        Component Model

51 files changed, 1 insertions, 67 deletions

diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
index 7e07fe12876..c1a1b0e8f86 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
@@ -141,7 +141,6 @@ project(AMI_AsynchT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    AsynchTS.inl
    
   }
 }
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
index 9006c758f77..b1dddc918d2 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_AsynchT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    AsynchT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
index b6ec6289a9b..c9f26a083a4 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_AsynchT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    AsynchT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
index b92e5ab119b..7764e9f8c69 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
@@ -136,13 +136,11 @@ project(AMI_DelReplyH_skel) : ciao_executor, ami, ami4ccm_servant {
 
   Header_Files {
     DelReplyHS.h
-   
+
     DelReplyH_skel_export.h
   }
 
   Inline_Files {
-    DelReplyHS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
index 46dfc87f5d5..0c636a532b6 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_DelReplyH_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    DelReplyH_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
index aa96f223f45..45d851c4442 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_DelReplyH_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    DelReplyH_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
index 57178e7d01a..9f2c62e4193 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
@@ -141,7 +141,6 @@ project(AMI_ExceptionT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    ExceptionTS.inl
    
   }
 }
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
index 174796e8a25..6fdfea1de13 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_ExceptionT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    ExceptionT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
index d251c688aef..6a4ada1853a 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_ExceptionT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    ExceptionT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
index 49bd8885e5d..7975bc23aae 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
@@ -141,8 +141,6 @@ project(AMI_GetComp_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    GetCompS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
index 5c84461084c..3b8c656eafa 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_GetComp_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    GetComp_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
index 61d8643baad..4f51e3e5bba 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_GetComp_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    GetComp_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
index 9e4bf15aa83..8b0b57d9933 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
@@ -113,8 +113,6 @@ project(AMI4CCM_IDL_Test_skel) : ciao_executor, ami, ami4ccm_servant   {
   }
 
   Inline_Files {
-    HelloS.inl
-    HelloAS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
index b0da2a3e0c3..32bfe262ccd 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
@@ -132,7 +132,6 @@ project(AMI4CCM_ITB_Hello_Comp_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    Hello_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
index 102ff194be6..329ebf879af 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterInArgsT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterInArgsTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
index 378f834457f..d117c93e2de 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInArgsT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterInArgsT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
index 098b4318ac6..45aaf485bf6 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInArgsT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterInArgsT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
index 3213bd0e819..97ed2e32475 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterInOutT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterInOutTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
index 21aa8c64ece..171b4758762 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInOutT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterInOutT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
index ad6ca66be06..f74b8d3d27e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInOutT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterInOutT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
index 4ab203034e9..cb4307a562e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
@@ -141,8 +141,6 @@ project(AMI_InterMulti_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterMultiS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
index 50534fda54f..7d28075ee97 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterMulti_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterMulti_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
index 93a6a9a3923..736fd1fdc88 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterMulti_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterMulti_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
index e10d4008190..1a66943435c 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterOutArgsT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterOutArgsTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
index 97360d4d252..638b223132e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterOutArgsT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterOutArgsT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
index d68ebe45df4..f7b4be3bec2 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterOutArgsT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterOutArgsT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
index 85c7e37393f..79a276079f6 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterReturnT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterReturnTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
index 810c41eb310..dcb934556f1 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterReturnT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterReturnT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
index 0b443de6fbc..c30da578161 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterReturnT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterReturnT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
index 5decdb9facd..51f9a435a3c 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
@@ -141,8 +141,6 @@ project(AMI_HelloT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    HelloTS.inl
-
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
index ee3155b11ad..d146c23f2d4 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_HelloT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    HelloT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
index 052a7eb741b..fff938bde86 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_HelloT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    HelloT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
index 11ada51a987..e9702add771 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
@@ -141,8 +141,6 @@ project(AMI_NoReplyH_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    NoReplyHS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
index ce200f3326e..3c62cf93713 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_NoReplyH_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    NoReplyH_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
index 0c9bf268274..f2decc6fb0c 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_NoReplyH_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    NoReplyH_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
index 25d2dd74a7a..7876403aa36 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
@@ -141,8 +141,6 @@ project(AMI_OneProcess_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    OneProcessS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
index 10768dd5db0..e818a82b143 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
@@ -127,7 +127,6 @@ project(AMI_OneProcess_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    OneProcess_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
index 0b11cbf053d..ccf61f94ed7 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_OneProcess_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    OneProcess_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
index 5ce19bdd2db..e6a9ae889f0 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
@@ -141,8 +141,6 @@ project(AMI_OneReplyH_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    OneReplyHS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
index c6aa5f39e87..ac52652ba3e 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_OneReplyH_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    OneReplyH_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
index ca3196cabc3..7afdccd8acc 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_OneReplyH_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    OneReplyH_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
index 728acf9edde..a9499955ee8 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
@@ -142,8 +142,6 @@ project(AMI_UsesSM_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    UsesSMS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
index d2ce5467c35..e98ec843155 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesSM_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    UsesSM_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
index f7bf8c2e456..5f102d474a3 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesSM_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    UsesSM_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
index fb3045878ba..a6d39cd9b18 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
@@ -166,8 +166,6 @@ project(AMI_ThreeComp_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    ThreeCompS.inl
-    ThreeComp_no_amiS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
index 3162d83792e..6b293e4ac14 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
@@ -127,7 +127,6 @@ project(AMI_ThreeComp_Base_Master_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    ThreeComp_MasterS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
index 62f6dd0804d..26fd307b0fd 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_ThreeComp_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    ThreeComp_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
index 6323dbd93b2..98b5ce181fd 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_ThreeComp_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    ThreeComp_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
index ecabfedc7bc..9355dd8d1b8 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
@@ -142,8 +142,6 @@ project(AMI_UsesMulti_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    UsesMultiS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
index 3b53f58a3e2..ffaad2e534c 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesMulti_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    UsesMulti_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
index 3ea71a81db8..1c24b38c1ea 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesMulti_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    UsesMulti_SenderS.inl
   }
 }