[certi-cvs] certi/scripts CERTI_NetworkMessage.msg

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/08 12:51:58

Modified files:
        scripts        : CERTI_NetworkMessage.msg 

Log message:
        First update for NetworkMessage specs in order to be able
        to regenerate NM_Classes.[hh|cc] from it entirely.
        Intermediate commit (not working [yet])

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CERTI_NetworkMessage.msg?cvsroot=certi&r1=1.14&r2=1.15

Patches:
Index: CERTI_NetworkMessage.msg
===================================================================
RCS file: /sources/certi/certi/scripts/CERTI_NetworkMessage.msg,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- CERTI_NetworkMessage.msg    30 Jan 2010 18:19:42 -0000      1.14
+++ CERTI_NetworkMessage.msg    8 Mar 2010 12:51:58 -0000       1.15
@@ -29,33 +29,31 @@
 // AKA CERTI Network Message
 native NetworkMessage {
     language CXX    [#include "NetworkMessage.hh"]
-    language Python [import certi.NetworkMessage]
-    language Java   [import certi.NetworkMessage]
+    language Java   [import certi.communication.NetworkMessage]
 }
 
 native FederationTime {
     language CXX    [#include "FedTimeD.hh"]
-    language Python [import certi.FedTimeD]
     language Java   [import certi.FedTimeD]
 }
 
 native AttributeHandle {
-    representation uint16
+    representation uint32
     language CXX [#include "certi.hh"]
 }
 
 native DimensionHandle {
-    representation uint16
+    representation uint32
     language CXX [#include "certi.hh"]
 }
 
 native InteractionClassHandle {
-    representation uint16
+    representation uint32
     language CXX [#include "certi.hh"]
 }
 
 native ObjectClassHandle {
-    representation uint16
+    representation uint32
     language CXX [#include "certi.hh"]
 }
 
@@ -65,12 +63,12 @@
 }
 
 native ParameterHandle {
-    representation uint16
+    representation uint32
     language CXX [#include "certi.hh"]
 }
 
 native SpaceHandle {
-    representation uint16
+    representation uint32
     language CXX [#include "certi.hh"]
 }
 
@@ -85,39 +83,41 @@
 }
 
 message NM_FOM_Dimension {
-        required DimensionHandle handle
+    required DimensionHandle handle {default=0}
         required string name
 }
 
-message NM_FOM_Rounting_Space {
-       required SpaceHandle space
+message NM_FOM_Routing_Space {
+    required SpaceHandle space {default=0}
        required string name
         repeated NM_FOM_Dimension dimensions
 }
 
 message NM_FOM_Attribute {
-        required AttributeHandle handle
+    required AttributeHandle handle {default=0}
         required string name
-       required SpaceHandle spaceHandle
+    required SpaceHandle spaceHandle {default=0}
        required OrderType order
        required TransportType transport
 }
 
 message NM_FOM_Object_Class {
-       required ObjectClassHandle handle
-       required ObjectClassHandle superClass
+    required ObjectClassHandle handle     {default=0}
+    required ObjectClassHandle superClass {default=0}
        required string name
         repeated NM_FOM_Attribute attributes
 }
 
 message NM_FOM_Parameter {
-        required ParameterHandle handle
+    required ParameterHandle handle {default=0}
         required string name
 }
 
 message NM_FOM_Interaction_Class {
-       required InteractionClassHandle handle
-       required SpaceHandle space
+       required InteractionClassHandle interactionClass {default=0}
+       required string name
+        required InteractionClassHandle superClass {default=0}
+       required SpaceHandle space {default=0}
        required OrderType order
        required TransportType transport
     repeated NM_FOM_Parameter parameters
@@ -146,7 +146,7 @@
        required uint32  bestEffortPeer
        required string  federationName // the federation name
        required string  federateName   // the federate name (should be unique 
within a federation)
-        repeated NM_FOM_Rounting_Space routingSpaces
+    repeated NM_FOM_Routing_Space routingSpaces
         repeated NM_FOM_Object_Class objectClasses
         repeated NM_FOM_Interaction_Class interactionClasses
 }
@@ -226,6 +226,10 @@
 
 message NM_Federation_Not_Restored : merge NetworkMessage {}
 
+message NM_WithHandleArray : merge  NetworkMessage {
+       repeated AttributeHandle handle 
+}
+
 message NM_Publish_Object_Class : merge NM_WithHandleArray {}
 
 message NM_Unpublish_Object_Class : merge NetworkMessage {}
@@ -314,12 +318,17 @@
 
 message NM_Confirm_Attribute_Ownership_Acquisition_Cancellation : merge 
NM_Request_Object_Attribute_Value_Update {}
 
+message NM_DDM_Base : merge  NM_WithHandleArray {
+       required bool DDM_bool { default=false }        
+} 
+
 message NM_DDM_Create_Region : merge NM_DDM_Base {
        required SpaceHandle space
        required int32 region
 }
 
 message NM_DDM_Modify_Region : merge NM_DDM_Base {
+        
        required int32 region
 }
 
@@ -351,14 +360,6 @@
        required ObjectClassHandle objectClass
 }
 
-message NM_WithHandleArray : merge  NetworkMessage {
-       repeated AttributeHandle handle 
-}
-
-message NM_DDM_Base : merge  NM_WithHandleArray {
-       required bool DDM_bool { default=false }
-}
-
 message New_NetworkMessage {
     required uint32          type  {default=0}
     //required string          name  {default="MessageBaseClass"}