[certi-cvs] certi/scripts CERTI_Message.msg

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/07 18:19:09

Modified files:
        scripts        : CERTI_Message.msg 

Log message:
        Refine CERTI Message.
        Concerning C++ specificities for natives
        their shouldn't be any libRTI includes referenced here
        because since Message are part of libCERTI it would
        create a libCERTI-->libRTI dependency which leads to
        circular dependencies since libRTI-->libCERTI is here too.
        
        This may not be a problem for java binding but this
        is definitely a problem for C++ 
        (we did face such problems on Windows once and it was
         not pleasant to solve just stay away from that)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CERTI_Message.msg?cvsroot=certi&r1=1.12&r2=1.13

Patches:
Index: CERTI_Message.msg
===================================================================
RCS file: /sources/certi/certi/scripts/CERTI_Message.msg,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CERTI_Message.msg   5 Mar 2010 18:15:35 -0000       1.12
+++ CERTI_Message.msg   7 Mar 2010 18:19:09 -0000       1.13
@@ -30,18 +30,15 @@
 // of a Message
 native Message {
     language CXX    [#include "Message.hh"]
-    language Python [import certi.Message]
-    language Java   [import certi.Message]
+    language Java   [import certi.communication.CertiMessage]
 }
 
 native AttributeHandleSet {
-    language CXX  [include "RTItypes.hh"]
+    language CXX  [#include "certi.hh"]
     language Java [import hla.rti.AttributeHandleSet;]
 }
 
 native LogicalTimeInterval {
-    language CXX  [//unimplemented 1]
-    language CXX  [//unimplemented 2]
     language Java [import hla.rti.AttributeHandleSet;]
 }
 
@@ -50,29 +47,27 @@
 }
 
 native FederateHandleSet {
-    language CXX  [#include "RTItypes.hh"]
+    language CXX  [#include "certi.hh"]
+    //language CXX  [typedef RTI::FederateHandleSet FederateHandleSet;]
     language Java [import hla.rti.FederateHandleSet;]
 }
 
 native SuppliedParameters {
-    language CXX  [//unimplemented]
     language Java [import hla.rti.SuppliedParameters;]
 }
 
-native Regions {
-    language CXX  [#include "RTItypes.hh"]
-    language Java [import hla.rti.Regions;]
+native Region {
+    language CXX  [#include "certi.hh"]    
+    language Java [import hla.rti.Region;]
 }
 
 native Extents {
-    language CXX  [//unimplemented]
     language Java [import hla.rti.Extents;]
 }
 
 native ResignAction  {
     representation uint16
-    language CXX [#include "RTItypes.hh"]      
-    language CXX [typedef RTI::ResignAction ResignAction;]     
+    language CXX [#include "certi.hh"]     
 }
 
 native Handle {
@@ -113,7 +108,7 @@
 
 native FederateHandle {
     representation uint32
-    language CXX [#include "RTItypes.hh"]
+    language CXX [#include "certi.hh"]
 }
 
 native ParameterHandle {
@@ -138,7 +133,7 @@
 
 native AttributeHandleValuePairSet {
     representation combine
-    language CXX   [#include "RTItypes.hh"]
+    language CXX   [combine AttributeHandleValuePairSet]
     language Java  [import hla.rti.SuppliedAttributes] 
 }
 
@@ -154,13 +149,18 @@
 
 native ParameterHandleValuePairSet {
     representation combine
-    language CXX   [#include "RTItypes.hh"]
+    language CXX   [combine ParameterHandleValuePairSet]
     language Java  [import hla.rti.SuppliedParameters]
 }
 
 native EventRetractionHandle {    
-    language CXX [#include "RTItypes.hh"]      
-    language CXX [typedef RTI::EventRetractionHandle EventRetractionHandle;]   
+    representation combine    
+    language CXX [combine EventRetractionHandle]      
+}
+
+message EventRetraction {
+       required FederateHandle sendingFederate {default = 0}
+    required uint64         SN              {default = 0}
 }
 
 // Closing connexion message
@@ -284,14 +284,18 @@
            repeated AttributeHandle       attributes
            repeated AttributeValue_t      values
         }
-        optional EventRetractionHandle eventRetraction
+        combine EventRetractionHandle {
+           optional EventRetraction eventRetraction                    
+        } 
 }
 
 message M_Discover_Object_Instance : merge Message {
            required ObjectClassHandle     objectClass
         required ObjectHandle          object
         required string                objectName        
-        optional EventRetractionHandle eventRetraction
+        combine EventRetractionHandle {
+           optional EventRetraction eventRetraction                    
+        }
 }
 
 message M_Reflect_Attribute_Values : merge Message {
@@ -301,7 +305,9 @@
            repeated AttributeHandle    attributes
            repeated AttributeValue_t   values
         }
-        optional EventRetractionHandle eventRetraction
+        combine EventRetractionHandle {
+           optional EventRetraction eventRetraction                    
+        }
 }
 
 message M_Send_Interaction : merge Message {
@@ -309,7 +315,9 @@
     repeated ParameterHandle        parameters
        repeated ParameterValue_t       values
        required RegionHandle           region
-       optional EventRetractionHandle eventRetraction          
+       combine EventRetractionHandle {
+           optional EventRetraction eventRetraction                    
+        }          
 }
 
 message M_Receive_Interaction : merge Message {
@@ -317,14 +325,18 @@
     repeated ParameterHandle        parameters
        repeated ParameterValue_t       values
        required RegionHandle           region  
-       optional EventRetractionHandle eventRetraction
+       combine EventRetractionHandle {
+           optional EventRetraction eventRetraction                    
+        }
 }
 
 message M_Delete_Object_Instance : merge Message {
            required ObjectClassHandle objectClass
         required ObjectHandle      object
         required string            objectName        
-        optional EventRetractionHandle eventRetraction
+        combine EventRetractionHandle {
+           optional EventRetraction eventRetraction                    
+        }
 }
 
 message M_Local_Delete_Object_Instance : merge Message {
@@ -335,7 +347,9 @@
            required ObjectClassHandle objectClass
         required ObjectHandle      object
         required string            objectName        
-        optional EventRetractionHandle eventRetraction
+        combine EventRetractionHandle {
+           optional EventRetraction eventRetraction                    
+        }
 }
 
 message M_Change_Attribute_Transportation_Type : merge Message {
@@ -528,7 +542,9 @@
 }
 
 message M_Retract : merge Message {
-       required EventRetractionHandle eventRetraction
+    combine EventRetractionHandle {
+          required EventRetraction eventRetraction                    
+    }  
 }
 
 message M_Request_Retraction : merge Message {}