Thu Jan 21 14:07:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
        * tests/CIDL/CodeGen/Basic.idl
        * tests/CIDL/CodeGen/CodeGen.idl
        * tests/IDL_Test/Included_Component/IC_Bar.idl
        * tests/IDL_Test/Inherited_Component/IhC_Bar.idl
        * tests/IDL_Test/Reused_Facet_Interface/Basic.idl
        * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
          Use the new pragma ciao lem

8 files changed, 38 insertions, 27 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6c055734da1..de3a3085a3e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jan 21 14:07:27 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
+        * tests/CIDL/CodeGen/Basic.idl
+        * tests/CIDL/CodeGen/CodeGen.idl
+        * tests/IDL_Test/Included_Component/IC_Bar.idl
+        * tests/IDL_Test/Inherited_Component/IhC_Bar.idl
+        * tests/IDL_Test/Reused_Facet_Interface/Basic.idl
+        * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
+          Use the new pragma ciao lem
+
 Thu Jan 21 13:55:41 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * bin/ciao_tests.lst:
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
index 9cd47181299..c2b2a15b719 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
@@ -3,7 +3,7 @@
 #ifndef TSEC_CHECKPOINTEI_IDL
 #define TSEC_CHECKPOINTEI_IDL
 
-#include "TSEC_CheckPointE.idl"
+#include "TSEC_CheckPoint.idl"
 
 module ENW
 {
@@ -13,7 +13,6 @@ module ENW
          Components::SessionComponent
   {
   };
-
 };
 
 #endif /* TSEC_CHECKPOINTEI_IDL */
diff --git a/CIAO/tests/CIDL/CodeGen/Basic.idl b/CIAO/tests/CIDL/CodeGen/Basic.idl
index 9c86c4b7846..03108b62e8b 100644
--- a/CIAO/tests/CIDL/CodeGen/Basic.idl
+++ b/CIAO/tests/CIDL/CodeGen/Basic.idl
@@ -16,6 +16,8 @@
 
 // @@NOTE: Do we need a pragma prefix. Anyway its broken now in TAO..
 
+#pragma ciao lem "BasicE.idl"
+
 module Extra
 {
   exception NoReason {};
diff --git a/CIAO/tests/CIDL/CodeGen/CodeGen.idl b/CIAO/tests/CIDL/CodeGen/CodeGen.idl
index 224315de2b8..409abd41057 100644
--- a/CIAO/tests/CIDL/CodeGen/CodeGen.idl
+++ b/CIAO/tests/CIDL/CodeGen/CodeGen.idl
@@ -1,6 +1,6 @@
 //$Id$
+
 #include "Basic.idl"
-#include "BasicE.idl"
 
 module Basic
 {
@@ -9,7 +9,7 @@ module Basic
     provides  ReadData data_read;
     attribute boolean is_not_necessary;
   };
-  
+
   component CodeGen : Base
   {
     provides  ReadData data_out;
@@ -17,30 +17,30 @@ module Basic
     publishes DataAvailable out_avail;
     consumes  DataAvailable in_avail;
     provides  AnalyzeData data_crunch;
-    
+
     readonly attribute boolean is_necessary;
   };
-    
+
   home BaseHome supports Extra::Supernumerary manages Base
   {
     void base_do_nothing ();
-    
+
     factory create_no_base (in long fake_id)
       raises (Extra::NoRhyme);
-      
+
     finder find_no_base ();
-      
+
     readonly attribute boolean is_useful;
   };
 
   home CodeGenHome : BaseHome manages CodeGen
   {
     factory create_no_derived ();
-    
+
     finder find_no_derived ();
-    
+
     attribute boolean is_not_useful;
-    
+
     string do_nothing ();
   };
 };
diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl
index 57dff3e58b0..77120d402d5 100644
--- a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl
+++ b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.idl
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "IC_Foo.idl"
-#include "IC_FooE.idl"
 
 component Bar
 {
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl
index 94804cd867b..749e064162e 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl
+++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.idl
@@ -2,7 +2,6 @@
 
 #include <Components.idl>
 #include "IhC_Foo.idl"
-#include "IhC_FooE.idl"
 
 component Bar : Foo
 {
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl
index 4e686a47fab..bf99c4863a9 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.idl
@@ -15,6 +15,8 @@
 
 #include <Components.idl>
 
+#pragma ciao lem "BasicE.idl"
+
 module Extra
 {
   exception NoReason {};
@@ -26,7 +28,7 @@ module Extra
     long superfluous_op (in string empty_arg)
       raises (NoReason);
   };
-  
+
   interface Supernumerary
   {
     void supernumerary_op (out string dummy_arg)
@@ -36,11 +38,11 @@ module Extra
 
 module Basic
 {
-  interface ReadData : Extra::Superfluous 
+  interface ReadData : Extra::Superfluous
   {
     string get_data ();
   };
-  
+
   interface AnalyzeData
   {
     void perform_analysis (inout string data);
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl b/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
index b55848abaa8..409abd41057 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
@@ -1,7 +1,6 @@
 //$Id$
 
 #include "Basic.idl"
-#include "BasicE.idl"
 
 module Basic
 {
@@ -10,7 +9,7 @@ module Basic
     provides  ReadData data_read;
     attribute boolean is_not_necessary;
   };
-  
+
   component CodeGen : Base
   {
     provides  ReadData data_out;
@@ -18,30 +17,30 @@ module Basic
     publishes DataAvailable out_avail;
     consumes  DataAvailable in_avail;
     provides  AnalyzeData data_crunch;
-    
+
     readonly attribute boolean is_necessary;
   };
-    
+
   home BaseHome supports Extra::Supernumerary manages Base
   {
     void base_do_nothing ();
-    
+
     factory create_no_base (in long fake_id)
       raises (Extra::NoRhyme);
-      
+
     finder find_no_base ();
-      
+
     readonly attribute boolean is_useful;
   };
 
   home CodeGenHome : BaseHome manages CodeGen
   {
     factory create_no_derived ();
-    
+
     finder find_no_derived ();
-    
+
     attribute boolean is_not_useful;
-    
+
     string do_nothing ();
   };
 };