Thu Nov 18 08:50:42 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>

        * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl:
        * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc:
        * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl:
        * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl:
        Add no ami4ccm interface in separate idl file.

4 files changed, 45 insertions, 8 deletions

diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl
index b13cb81b928..3d4d8717f3b 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.idl
@@ -30,12 +30,6 @@ module ThreeComp
       long bar (in long cmd, out string answer)
         raises (InternalError);
     };
-  // test with no ciao ami4ccm interface, no pragma, see above
-  interface MyBar
-    {
-      long testbar (in long cmd, out string answer)
-        raises (InternalError);
-    };
 };
 
 #endif
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
index 0f4205d49a2..fb3045878ba 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
@@ -1,5 +1,21 @@
 // $Id$
+project(AMI_ThreeComp_no_ami_dl_gen) : componentidldefaults {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=THREECOMP_STUB_Export \
+              -Wb,stub_export_include=ThreeComp_stub_export.h \
+              -Wb,skel_export_macro=THREECOMP_SKEL_Export \
+              -Wb,skel_export_include=ThreeComp_skel_export.h \
+              -Wb,conn_export_macro=THREECOMP_CONN_Export \
+              -Wb,conn_export_include=ThreeComp_conn_export.h \
+              -Wb,exec_export_macro=THREECOMP_EXEC_Export \
+              -Wb,exec_export_include=ThreeComp_exec_export.h \
+              -I..
+  idlflags -= -Gsv
 
+  IDL_Files {
+    ThreeComp_no_ami.idl
+  }
+}
 project(AMI_ThreeComp_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=THREECOMP_STUB_Export \
@@ -19,7 +35,7 @@ project(AMI_ThreeComp_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
 }
 
 project(AMI_ThreeComp_lem_gen) : ciaoidldefaults {
-  after += AMI_ThreeComp_idl_gen AMI_ThreeComp_lema_gen
+  after += AMI_ThreeComp_idl_gen AMI_ThreeComp_lema_gen AMI_ThreeComp_no_ami_dl_gen
   custom_only = 1
   idlflags += -Wb,export_macro=THREECOMP_LEM_STUB_Export \
               -Wb,export_include=ThreeComp_lem_stub_export.h \
@@ -27,6 +43,7 @@ project(AMI_ThreeComp_lem_gen) : ciaoidldefaults {
 
   IDL_Files {
     ThreeCompE.idl
+    ThreeComp_no_amiE.idl
   }
 }
 
@@ -76,15 +93,18 @@ project(AMI_ThreeComp_stub) : ccm_stub, ami, ami4ccm_stub {
   Source_Files {
     ThreeCompC.cpp
     ThreeCompAC.cpp
+    ThreeComp_no_amiC.cpp
   }
 
   Header_Files {
     ThreeCompC.h
     ThreeComp_stub_export.h
+    ThreeComp_no_amiC.h
 }
 
   Inline_Files {
     ThreeCompC.inl
+   ThreeComp_no_amiC.inl
   }
 }
 
@@ -104,15 +124,18 @@ project(AMI_ThreeComp_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub {
   Source_Files {
     ThreeCompEC.cpp
     ThreeCompAEC.cpp
+    ThreeComp_no_amiEC.cpp
   }
 
   Header_Files {
     ThreeCompEC.h
     ThreeComp_lem_stub_export.h
+    ThreeComp_no_amiEC.h
 }
 
   Inline_Files {
     ThreeCompEC.inl
+    ThreeComp_no_amiEC.inl
   }
 }
 
@@ -132,17 +155,19 @@ project(AMI_ThreeComp_skel) : ciao_executor, ami, ami4ccm_servant {
   Source_Files {
     ThreeCompS.cpp
     ThreeCompAS.cpp
+    ThreeComp_no_amiS.cpp
   }
 
   Header_Files {
     ThreeCompS.h
+    ThreeComp_no_amiS.h
    
     ThreeComp_skel_export.h
   }
 
   Inline_Files {
     ThreeCompS.inl
-   
+    ThreeComp_no_amiS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl
new file mode 100644
index 00000000000..4a9b94e8ee8
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp_no_ami.idl
@@ -0,0 +1,17 @@
+// $Id$
+
+#ifndef THREECOMP_NO_AMI_IDL
+#define THREECOMP_NO_AMI_IDL
+
+#pragma ciao lem "Base/ThreeComp_no_amiE.idl"
+
+module ThreeComp
+{
+   // test with no ciao ami4ccm interface, no pragma, see above
+  interface MyBar
+    {
+      long testbar (in long cmd, out string answer);
+    };
+};
+
+#endif
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl
index b9775ec0961..87ce3a91444 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.idl
@@ -6,6 +6,7 @@
 #include <Components.idl>
 
 #include "Base/ThreeComp.idl"
+#include "Base/ThreeComp_no_ami.idl"
 
 #pragma ciao ami4ccm receptacle "ThreeComp::Sender::run_my_foo"