perfsonar development work

Author: roman
Date: 2007-12-13 09:33:58 -0500 (Thu, 13 Dec 2007)
New Revision: 3128

Modified:
   trunk/geant2_java-rrd-ma/doc/schema/MetadataKeyResponse.rnc
   trunk/geant2_java-rrd-ma/doc/schema/SetupDataResponse.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 
14:17:16 UTC (rev 3127)
+++ trunk/geant2_java-rrd-ma/doc/schema/MetadataKeyResponse.rnc 2007-12-13 
14:33:58 UTC (rev 3128)
@@ -15,7 +15,7 @@
         Type? &
         Parameters? &
         (
-                (Metadata+|ResultCodeMetadata) &
+                Metadata+ &
                 Data+
         )+
 
@@ -133,7 +133,7 @@
 Key =
         element nmwg:key
         {
-                attribute id {xsd:string}?,
+                Identifier?,
                 Parameters+
         }
 

Modified: trunk/geant2_java-rrd-ma/doc/schema/SetupDataResponse.rnc
===================================================================
--- trunk/geant2_java-rrd-ma/doc/schema/SetupDataResponse.rnc   2007-12-13 
14:17:16 UTC (rev 3127)
+++ trunk/geant2_java-rrd-ma/doc/schema/SetupDataResponse.rnc   2007-12-13 
14:33:58 UTC (rev 3128)
@@ -15,7 +15,7 @@
         Type? &
         Parameters? &
         (
-                (Metadata+|ResultCodeMetadata)&
+                Metadata+ &
                 Data+
         )+
 
@@ -29,21 +29,27 @@
         attribute type { "SetupDataResponse" }
 
 Metadata =
-        element nmwg:metadata
-        {
-                (
-                        Identifier &
-                        MetadataIdentifierRef? &
-                        (
-                          Subject |
-                          FilterMetadataContent |
-                          MetadataKeyContent
-                        ) &
-                        EventType? &
-                        Parameters?
-                )
+        element nmwg:metadata {
+                Identifier &
+                (FoundMetadata | ResultCodeMetadata)
         }
 
+FoundMetadata =
+        (
+                 MetadataIdentifierRef? &
+                 (
+                         Subject |
+                         FilterMetadataContent |
+                         MetadataKeyContent
+                  ) &
+                  EventType? &
+                  Parameters?
+        )
+
+
+ResultCodeMetadata = EventType
+
+
 MetadataIdentifierRef =
         attribute metadataIdRef { xsd:string }
 
@@ -52,7 +58,8 @@
                 {
                     "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
                 }
 
 Subject =
@@ -83,7 +90,7 @@
 InterfaceAddress =
         element nmwgt:ifAddress
         {
-                        attribute type{ xsd:string },
+                        attribute type { xsd:string },
                         xsd:string
         }
 
@@ -109,13 +116,11 @@
         element nmwgt:capacity {xsd:string}
 
 FilterMetadataContent =
-
         element select:subject
         {
-                attribute id {xsd:string},
+                Identifier,
                 attribute metadataIdRef {xsd:string}
         }?,
-
         element select:parameters { ParametersContent }
 
 Parameters =
@@ -140,34 +145,30 @@
 MetadataKeyContent =
             element nmwg:key
                 {
-                        attribute id {xsd:string}?,
+                        Identifier?,
                         Parameters+
                 }
 
-ResultCodeMetadata =
-        element nmwg:metadata
-        {
-                attribute id {xsd:string},
-                element nmwg:eventType {xsd:string}
-        }
-
-Data = (ResultData | ResultCodeData)
-
-ResultData =
+Data =
         element nmwg:data
         {
                 Identifier? &
                 MetadataIdentifierRef &
-                Datum*
+                (Datum* | ResultCodeDatum)
         }
 
+ResultCodeDatum =
+        element nmwgr:datum { xsd:string }
+
 Datum =
-        element nmwg:datum { DatumContent } |
-        element netutil:datum { DatumContent } |
-        element errors:datum { DatumContent } |
-        element discards:datum { DatumContent }
+        (
+                element nmwg:datum { DatumContent } |
+                element netutil:datum { DatumContent } |
+                element errors:datum { DatumContent } |
+                element discards:datum { DatumContent }
+        )
 
-DatumContent = 
+DatumContent =
         (
                 attribute value {xsd:string}&
                 attribute timeValue {xsd:string}&
@@ -175,10 +176,3 @@
                 attribute valueUnits {xsd:string}?
         )
 
-ResultCodeData =
-        element nmwg:data
-        {
-                Identifier? &
-                MetadataIdentifierRef &
-                element nmwgr:datum { xsd:string }
-        }
\ No newline at end of file