perfsonar development work

Author: roman
Date: 2007-12-13 06:54:08 -0500 (Thu, 13 Dec 2007)
New Revision: 3126

Modified:
   trunk/geant2_java-rrd-ma/doc/schema/MetadataKeyResponse.rnc
Log:
updated to be accepted by soapui




Modified: trunk/geant2_java-rrd-ma/doc/schema/MetadataKeyResponse.rnc
===================================================================
--- trunk/geant2_java-rrd-ma/doc/schema/MetadataKeyResponse.rnc 2007-12-13 
11:48:12 UTC (rev 3125)
+++ trunk/geant2_java-rrd-ma/doc/schema/MetadataKeyResponse.rnc 2007-12-13 
11:54:08 UTC (rev 3126)
@@ -31,22 +31,30 @@
 Metadata =
         element nmwg:metadata {
                 Identifier &
+                (FoundMetadata | ResultCodeMetadata)
+        }
+
+FoundMetadata =
+        (
                 MetadataIdentifierRef? &
                 ( (Subject? & EventType? & Parameters?)
                 | Key )
-        }
+        )
 
-MetadataIdentifierRef =
-        attribute metadataIdRef { xsd:string }
-
 EventType =
         element nmwg:eventType
                 {
                     "http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; |
                     "http://ggf.org/ns/nmwg/characteristic/errors/2.0"; |
-                    "http://ggf.org/ns/nmwg/characteristic/discards/2.0";
+                    "http://ggf.org/ns/nmwg/characteristic/discards/2.0"; |
+                    xsd:string
                 }
 
+ResultCodeMetadata = EventType
+
+MetadataIdentifierRef =
+        attribute metadataIdRef { xsd:string }
+
 Subject =
         element netutil:subject {SubjectContent} |
         element errors:subject {SubjectContent} |
@@ -75,7 +83,7 @@
 InterfaceAddress =
         element nmwgt:ifAddress {
                         attribute type{ xsd:string },
-                        xsd:string  
+                        xsd:string
         }
 
 HostName =
@@ -116,20 +124,10 @@
                 )
         }
 
-ResultCodeMetadata =
-        element nmwg:metadata {
-                attribute id {xsd:string},
-                element nmwg:eventType {xsd:string}
-        }
-
-Data = (KeyData|ResultCodeData)
-
-KeyData =
-        element nmwg:data
-        {
+Data = element nmwg:data {
                 Identifier? &
                 MetadataIdentifierRef &
-                Key
+                (Key|ResultCode)
         }
 
 Key =
@@ -139,9 +137,5 @@
                 Parameters+
         }
 
-ResultCodeData =
-        element nmwg:data {
-                attribute id {xsd:string}?,
-                attribute metadataIdRef {xsd:string},
-                element nmwgr:datum { xsd:string }
-        }
\ No newline at end of file
+ResultCode =
+        element nmwgr:datum { xsd:string }