perfsonar development work

Author: roman
Date: 2007-12-12 09:49:37 -0500 (Wed, 12 Dec 2007)
New Revision: 3118

Modified:
   
trunk/geant2_java-sql-ma/doc/schema/link_status/MeasurementArchiveStoreRequest.rnc
   trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyRequest.rnc
   trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyResponse.rnc
   trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataRequest.rnc
   trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataResponse.rnc
Log:

updated to be accepted by soapui




Modified: 
trunk/geant2_java-sql-ma/doc/schema/link_status/MeasurementArchiveStoreRequest.rnc
===================================================================
--- 
trunk/geant2_java-sql-ma/doc/schema/link_status/MeasurementArchiveStoreRequest.rnc
  2007-12-11 18:30:08 UTC (rev 3117)
+++ 
trunk/geant2_java-sql-ma/doc/schema/link_status/MeasurementArchiveStoreRequest.rnc
  2007-12-12 14:49:37 UTC (rev 3118)
@@ -28,10 +28,10 @@
 Metadata=
         element nmwg:metadata {
                 (
-Identifier &
-MetadataIdentifierRef? &
-            (SubjectMetadata|KeyMetadata)? &
-            element nmwg:eventType{xsd:string}?
+                    Identifier &
+                    MetadataIdentifierRef? &
+                    (SubjectMetadata|KeyMetadata)? &
+                    element nmwg:eventType{xsd:string}?
                 )
         }
 
@@ -44,38 +44,40 @@
             Identifier &
             element nmtl2:link {
                 Identifier? &
-                (FullNodeContents|ReferenceNodeContents)* &
-                LinkSubject? 
+                LinkNode* &
+                LinkSubject?
             }? 
         } &
-        Parameters? 
+        Parameters?
     )
 
-FullNodeContents =
-    (
-        element nmwgtopo3:node {
-                    Identifier? &
-            element nmwgtopo3:name{
-                            attribute type {"logical"}&
-                            xsd:string
-                    }? &
-                    element nmwgtopo3:country{xsd:string}? &
-                    element nmwgtopo3:city{xsd:string}? &
-                    element nmwgtopo3:latitude{xsd:string}? &
-                    element nmwgtopo3:longitude{xsd:string}? &
-                    element nmwgtopo3:institution{xsd:string}? &
-                    element nmwgtopo3:type{"TopologyPoint"}? &
-                    element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
-        }
-    )
+LinkNode = element nmwgtopo3:node
+    {
+        Identifier? &
+        (
+            (
+                element nmwgtopo3:name {
+                    attribute type {"logical"} &
+                    xsd:string
+                }? &
+                element nmwgtopo3:country{xsd:string}? & 
+                element nmwgtopo3:city{xsd:string}? &
+                element nmwgtopo3:latitude{xsd:string}? &
+                element nmwgtopo3:longitude{xsd:string}? &
+                element nmwgtopo3:institution{xsd:string}? &
+                element nmwgtopo3:type{"TopologyPoint"}? &
+                element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
+            )
+            |
+            (
+                attribute nodeIdRef{xsd:string} &
+                element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
+            )
+        )
+    }
 
-ReferenceNodeContents =
-        element nmwgtopo3:node {
-                    Identifier? &       
-            attribute nodeIdRef{xsd:string}&
-            element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}
-        }
 
+
 LinkSubject=
     (
         element nmtl2:name {
@@ -108,8 +110,8 @@
 Data =
         element nmwg:data {
             Identifier &
-MetadataIdentifierRef &
-        element ifevt:datum {
+            MetadataIdentifierRef &
+            element ifevt:datum {
                         attribute timeType {"unix"}&
                         attribute timeValue {xsd:string}&
                         element ifevt:stateAdmin {

Modified: 
trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyRequest.rnc
===================================================================
--- trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyRequest.rnc    
  2007-12-11 18:30:08 UTC (rev 3117)
+++ trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyRequest.rnc    
  2007-12-12 14:49:37 UTC (rev 3118)
@@ -41,45 +41,52 @@
     element nmwg:subject {
         Identifier &
         element nmtl2:link {
-Identifier? &
-            (NodeSubject +|
-LinkSubject)?   
+            Identifier? &
+            (NodeSubject+ | LinkSubject)?
         }
     }
 
-NodeSubject=
-    element nmwgtopo3:node {
-            Identifier? &
-            element nmwgtopo3:name{
-                attribute type {"logical"}&
-                xsd:string
-            }? &
-            element nmwgtopo3:country{xsd:string}? & 
-            element nmwgtopo3:city{xsd:string}? &
-            element nmwgtopo3:latitude{xsd:string}? &
-            element nmwgtopo3:longitude{xsd:string}? &
-            element nmwgtopo3:institution{xsd:string}? & 
-            element nmwgtopo3:type{"TopologyPoint"}?
-    }
+NodeSubject = LinkNode
 
-LinkSubject= 
+LinkSubject =
     (
         element nmtl2:name {
-            attribute type{"logical"}&
+            attribute type{"logical"} &
             xsd:string
         }? &
         element nmtl2:globalName {
-            attribute type{"logical"}&
+            attribute type{"logical"} &
             xsd:string
         }? &
         element nmtl2:type {"Domain_Link"|"ID_Link"}? &
-        element nmwgtopo3:node{
-            Identifier? &
-            attribute nodeIdRef{xsd:string}&
-            element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
-        }*
+        LinkNode*
     )
 
+LinkNode = element nmwgtopo3:node
+    {
+        Identifier? &
+        (
+            (
+                element nmwgtopo3:name {
+                    attribute type {"logical"} &
+                    xsd:string
+                }? &
+                element nmwgtopo3:country{xsd:string}? & 
+                element nmwgtopo3:city{xsd:string}? &
+                element nmwgtopo3:latitude{xsd:string}? &
+                element nmwgtopo3:longitude{xsd:string}? &
+                element nmwgtopo3:institution{xsd:string}? &
+                element nmwgtopo3:type{"TopologyPoint"}?
+            )
+            |
+            (
+                attribute nodeIdRef{xsd:string} &
+                element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
+            )
+        )
+    }
+
+
 FilterMetadata = 
     (
         element select:subject {

Modified: 
trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyResponse.rnc
===================================================================
--- trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyResponse.rnc   
  2007-12-11 18:30:08 UTC (rev 3117)
+++ trunk/geant2_java-sql-ma/doc/schema/link_status/MetadataKeyResponse.rnc   
  2007-12-12 14:49:37 UTC (rev 3118)
@@ -12,7 +12,7 @@
         MessageIdentifierRef? &
         Type &
         (
-                (Metadata+ |ResultCodeMetadata)&
+                Metadata+ &
                 Data+
         )
 
@@ -25,94 +25,96 @@
 Type =
         attribute type { "MetadataKeyResponse" }
 
-Metadata=
+Metadata =
         element nmwg:metadata {
                 (
-Identifier &
-MetadataIdentifierRef? &
-SubjectMetadata? &
-            Parameters?
+                    (
+                        Identifier &
+                        MetadataIdentifierRef? &
+                        SubjectMetadata? &
+                        Parameters?
+                    )
+                    |
+                    MetadataResultCode
                 )
         }
 
+MetadataResultCode =
+        (
+                Identifier,
+                element nmwg:eventType {text}
+        )
+
 MetadataIdentifierRef =
         attribute metadataIdRef { xsd:string }
 
-SubjectMetadata=
+SubjectMetadata =
     element nmwg:subject {
         Identifier &
         (
-            element nmwgtopo3:node {
-                        Identifier&
-                element nmwgtopo3:name{
-                                    attribute type {"logical"}&
-                                    xsd:string
-                            }? &
-                element nmwgtopo3:country{xsd:string}? &
+            LinkNode+
+            |
+            element nmtl2:link {
+                        Identifier &
+                        element nmtl2:name {
+                                    attribute type {"logical"} &
+                                    text
+                            } &
+                        element nmtl2:globalName {
+                                        attribute type {"logical"} &
+                                        text
+                            } &
+                        element nmtl2:type {xsd:string}? &
+                        LinkNode*
+                }
+        )
+    }
+
+LinkNode = element nmwgtopo3:node
+    {
+        Identifier? &
+        (
+            (
+                element nmwgtopo3:name {
+                    attribute type {"logical"} &
+                    xsd:string
+                }? &
+                element nmwgtopo3:country{xsd:string}? & 
                 element nmwgtopo3:city{xsd:string}? &
-                element nmwgtopo3:institution{xsd:string}? &        
                 element nmwgtopo3:latitude{xsd:string}? &
                 element nmwgtopo3:longitude{xsd:string}? &
+                element nmwgtopo3:institution{xsd:string}? &
                 element nmwgtopo3:type{"TopologyPoint"}?
-            }+ 
-            | element nmtl2:link {
-                Identifier &
-                element nmtl2:name {
-                                    attribute type{"logical"}&
-                                    text
-                            }&
-                element nmtl2:globalName {
-                                        attribute type{"logical"}&
-                                        text
-                                }&
-                            element nmtl2:type {xsd:string}? &
-                element nmwgtopo3:node {
-                                    Identifier &
-                                    attribute nodeIdRef{xsd:string} &
-       element nmwgtopo3:role{
-               "DemarcPoint"|"EndPoint"
-       }?
-                            }*  
-                }
+            )
+            |
+            (
+                attribute nodeIdRef{xsd:string} &
+                element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
+            )
         )
     }
 
-Parameters = 
+Parameters =
     element nmwg:parameters {
         Identifier &
         element nmwg:parameter {
-            attribute name {xsd:string} & 
+            attribute name {xsd:string} &
             attribute value {xsd:string}? &
             xsd:string
         }+
     }
 
-ResultCodeMetadata =
-        element nmwg:metadata {
-                attribute id {xsd:string},
-                element nmwg:eventType {text}
-        }
-
-Data = (KeyData|ResultCodeData)
-
-KeyData =
-        element nmwg:data
-        {
+Data = element nmwg:data {
                 Identifier &
                 MetadataIdentifierRef &
-                Key
+                (DataKey | DataResultCode)
         }
 
-Key =
-        element nmwg:key
+
+DataKey = element nmwg:key
         {
-                attribute id {xsd:string}?,
+                Identifier?,
                 Parameters
         }
 
-ResultCodeData =
-        element nmwg:data {
-                attribute id {xsd:string},
-                attribute metadataIdRef {xsd:string},
-                element nmwgr:datum { text }
-        }
\ No newline at end of file
+DataResultCode =  element nmwgr:datum {text}

Modified: trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataRequest.rnc
===================================================================
--- trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataRequest.rnc      
  2007-12-11 18:30:08 UTC (rev 3117)
+++ trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataRequest.rnc      
  2007-12-12 14:49:37 UTC (rev 3118)
@@ -27,10 +27,10 @@
 Metadata=
         element nmwg:metadata {
                 (
-Identifier &
-MetadataIdentifierRef? &
-            (SubjectMetadata|FilterMetadata|KeyMetadata)? &
-            element nmwg:eventType{xsd:string}?
+                 Identifier &
+                 MetadataIdentifierRef? &
+                 (SubjectMetadata | FilterMetadata | KeyMetadata)? &
+                 element nmwg:eventType{xsd:string}?
                 )
         }
 
@@ -43,43 +43,52 @@
         element nmtl2:link {
             Identifier? &
             (NodeSubject +|
-            LinkSubject)? 
+            LinkSubject)?
         }?
     }
 
-NodeSubject=
-    element nmwgtopo3:node {
-        Identifier? &
-        element nmwgtopo3:name{
-            attribute type {"logical"}&
-            xsd:string
-        }? &
-        element nmwgtopo3:country{xsd:string}? & 
-        element nmwgtopo3:city{xsd:string}? &
-        element nmwgtopo3:latitude{xsd:string}? &
-        element nmwgtopo3:longitude{xsd:string}? &
-        element nmwgtopo3:institution{xsd:string}? & 
-        element nmwgtopo3:type{"TopologyPoint"}?  
-    }
+NodeSubject = LinkNode
 
-LinkSubject=
+LinkSubject =
     (
         element nmtl2:name {
-            attribute type{"logical"}&
+            attribute type{"logical"} &
             xsd:string
         }? &
         element nmtl2:globalName {
-            attribute type{"logical"}&
+            attribute type{"logical"} &
             xsd:string
         }? &
         element nmtl2:type {"Domain_Link"|"ID_Link"}? &
-        element nmwgtopo3:node{
-            Identifier? &
-            attribute nodeIdRef{xsd:string}&
-            element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
-        }*
+        LinkNode*
     )
 
+
+LinkNode = element nmwgtopo3:node
+    {
+        Identifier? &
+        (
+            (
+                element nmwgtopo3:name {
+                    attribute type {"logical"} &
+                    xsd:string
+                }? &
+                element nmwgtopo3:country{xsd:string}? & 
+                element nmwgtopo3:city{xsd:string}? &
+                element nmwgtopo3:latitude{xsd:string}? &
+                element nmwgtopo3:longitude{xsd:string}? &
+                element nmwgtopo3:institution{xsd:string}? &
+                element nmwgtopo3:type{"TopologyPoint"}?
+            )
+            |
+            (
+                attribute nodeIdRef{xsd:string} &
+                element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
+            )
+        )
+    }
+
+
 FilterMetadata = 
     (
         element select:subject {
@@ -88,10 +97,10 @@
         }&
         element select:parameters {
             Identifier &
-            element nmwg:parameter {    
-                attribute name{"time"|"startTime"|"endTime"}&
-                xsd:string 
-            }+ 
+            element nmwg:parameter {
+                attribute name{"time"|"startTime"|"endTime"} &
+                xsd:string
+            }+
         }
         )
 
@@ -105,7 +114,7 @@
         element nmwg:parameters {
             Identifier &
             element nmwg:parameter {
-                attribute name{xsd:string}&
+                attribute name{xsd:string} &
                 attribute value{xsd:string}? &
                 xsd:string
             }+
@@ -114,5 +123,5 @@
 Data =
         element nmwg:data {
                         Identifier &
-                        MetadataIdentifierRef 
+                        MetadataIdentifierRef
         }
\ No newline at end of file

Modified: 
trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataResponse.rnc
===================================================================
--- trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataResponse.rnc     
  2007-12-11 18:30:08 UTC (rev 3117)
+++ trunk/geant2_java-sql-ma/doc/schema/link_status/SetupDataResponse.rnc     
  2007-12-12 14:49:37 UTC (rev 3118)
@@ -13,7 +13,7 @@
         MessageIdentifierRef? &
         Type &
         (
-                (Metadata+ | ResultCodeMetadata)&
+                Metadata+ &
                 Data+
         )
 
@@ -29,13 +29,21 @@
 Metadata=
         element nmwg:metadata {
                 (
-Identifier &
-MetadataIdentifierRef? &
-            (SubjectMetadata|KeyMetadata) &
-            Parameters?
+                    Identifier &
+                    MetadataIdentifierRef? &
+                    (SubjectMetadata|KeyMetadata) &
+                    Parameters?
                 )
+                |
+                MetadataResultCode
         }
 
+MetadataResultCode =
+        (
+                Identifier,
+                element nmwg:eventType {text}
+        )
+
 MetadataIdentifierRef =
         attribute metadataIdRef { xsd:string }
 
@@ -43,40 +51,47 @@
     element nmwg:subject {
         Identifier &
         (
-            element nmwgtopo3:node {
-                        Identifier&
-                element nmwgtopo3:name{
-                                    attribute type {"logical"}&
-                                    xsd:string
-                            }? &
-                element nmwgtopo3:country{xsd:string}? &
-                element nmwgtopo3:city{xsd:string}? &
-                element nmwgtopo3:institution{xsd:string}? &
-                element nmwgtopo3:latitude{xsd:string}? &
-                element nmwgtopo3:longitude{xsd:string}? &
-                element nmwgtopo3:type{"TopologyPoint"}?
-            }+ 
+            LinkNode+
             | element nmtl2:link {
                 Identifier &
                 element nmtl2:name {
-                                    attribute type{"logical"}&
+                                    attribute type{"logical"} &
                                     text
-                            }&
+                            } &
                 element nmtl2:globalName {
-                                        attribute type{"logical"}&
+                                        attribute type{"logical"} &
                                         text
-                                }&
-                            element nmtl2:type {xsd:string}? &
-                element nmwgtopo3:node {
-                                    Identifier &
-                                    attribute nodeIdRef{xsd:string} &
-                                    element nmwgtopo3:role{
-"DemarcPoint"|"EndPoint"}?
-                            }*
+                                } &
+                element nmtl2:type {xsd:string}? &
+                LinkNode*
                 }
         )
     }
 
+LinkNode = element nmwgtopo3:node
+    {
+        Identifier? &
+        (
+            (
+                element nmwgtopo3:name {
+                    attribute type {"logical"} &
+                    xsd:string
+                }? &
+                element nmwgtopo3:country{xsd:string}? & 
+                element nmwgtopo3:city{xsd:string}? &
+                element nmwgtopo3:latitude{xsd:string}? &
+                element nmwgtopo3:longitude{xsd:string}? &
+                element nmwgtopo3:institution{xsd:string}? &
+                element nmwgtopo3:type{"TopologyPoint"}?
+            )
+            |
+            (
+                attribute nodeIdRef{xsd:string} &
+                element nmwgtopo3:role{"DemarcPoint"|"EndPoint"}?
+            )
+        )
+    }
+
 KeyMetadata = 
     element nmwg:key {
         Identifier &
@@ -93,35 +108,25 @@
         }+
     }
 
-ResultCodeMetadata =
-        element nmwg:metadata {
-                attribute id {xsd:string},
-                element nmwg:eventType {text}
+Data =
+        element nmwg:data {
+            Identifier &
+            MetadataIdentifierRef &
+            (ResultData | ResultCodeData)
         }
 
-Data = (ResultData|ResultCodeData)
 
 ResultData =
-        element nmwg:data
-        {
-Identifier &
-MetadataIdentifierRef &
-        element ifevt:datum {
-            attribute timeType {"unix"}&
-            attribute timeValue {xsd:string}&
-            element ifevt:stateAdmin {
-                xsd:string
-            }&
-            element ifevt:stateOper {
-                xsd:string
-            }
+            element ifevt:datum {
+                    attribute timeType {"unix"} &
+                    attribute timeValue {xsd:string} &
+                    element ifevt:stateAdmin {
+                        xsd:string
+                    } &
+                    element ifevt:stateOper {
+                        xsd:string
+                    }
+            }*
 
-        }*
-        }
-
 ResultCodeData =
-        element nmwg:data {
-                attribute id {xsd:string},
-                attribute metadataIdRef {xsd:string},
-                element nmwgr:datum { text }
-        }
\ No newline at end of file
+            element nmwgr:datum { text }