ChangeLogTag: Tue Nov 3 17:46:17 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 53 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index ce7aee43747..439bccfb6b7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Nov  3 17:46:17 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/Cornucopia/Cornucopia.idl:
+        * tests/IDL_Test/Keywords/Keyword_Clash.idl:
+        
+          Updated test IDL to included IDL3+ cases, sent by
+          Johnny Willemsen <jwillemsen at remedy dot nl>.
+
 Tue Nov  3 13:54:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ccm/extension/*:
diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
index 180db9bf901..dcb3159bf7d 100644
--- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
+++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
@@ -72,6 +72,23 @@ enum Color
 
 module DerivedMod
 {
+  porttype CombinedPort
+  {
+    provides pface pface_provider;
+    uses uface uface_user;
+    uses multiple umface umface_umuser;
+  };
+
+  component CompCombinedPort
+  {
+    port CombinedPort cc;
+  };
+
+  component MirrorCompCombinedPort
+  {
+    mirrorport CombinedPort cc;
+  };
+
   component CompDerived : BaseMod::CompBase
   {
     attribute Color stripe;
diff --git a/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl b/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl
index f47231c023d..d78b200cddd 100644
--- a/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl
+++ b/CIAO/tests/IDL_Test/Keywords/Keyword_Clash.idl
@@ -29,7 +29,27 @@ module static
       interface virtual
       {
       };
-      
+
+      interface _port
+      {
+      };
+
+      interface _alias
+      {
+      };
+
+      interface _mirrorport
+      {
+      };
+
+      interface _porttype
+      {
+      };
+
+      interface _connector
+      {
+      };
+
       eventtype _eventtype
       {
         private virtual _public;
@@ -54,23 +74,23 @@ module _component
     provides _interface::_attribute _local;
     provides _oneway else;
     provides static::_readonly::protected::virtual while;
-    
+
     attribute long _abstract;
-    
+
     uses multiple _interface::_attribute if;
     uses multiple _oneway mutable;
     uses multiple static::_readonly::protected::virtual register;
-    
+
     uses _interface::_attribute _union;
     uses _oneway _struct;
     uses static::_readonly::protected::virtual volatile;
-    
+
     publishes _eventtype _object;
     publishes static::_readonly::protected::_eventtype do;
-    
+
     consumes _eventtype _const;
     consumes static::_readonly::protected::_eventtype const_cast;
-    
+
     emits _eventtype class;
     emits static::_readonly::protected::_eventtype delete;
   };
@@ -81,7 +101,7 @@ module _component
     catch (
         inout static::_readonly::protected::_eventtype try)
       raises (_interface::_attribute::_inout);
-      
+
     finder continue (in _interface::_attribute _inout);
   };
 };