perfsonar development work

Author: mac
Date: 2008-01-07 08:40:31 -0500 (Mon, 07 Jan 2008)
New Revision: 3182

Added:
   trunk/geant2_java-xml-ls/doc/schema/rnc/LSDeregisterResponse.rnc
   trunk/geant2_java-xml-ls/doc/schema/rnc/LSKeepaliveResponse.rnc
   trunk/geant2_java-xml-ls/doc/schema/rnc/LSQueryResponse.rnc
   trunk/geant2_java-xml-ls/doc/schema/rnc/LSRegisterResponse.rnc
Modified:
   trunk/geant2_java-xml-ls/doc/schema/rnc/EchoResponse.rnc
   trunk/geant2_java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc
   trunk/geant2_java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc
Log:
RNC files for response messages



Modified: trunk/geant2_java-xml-ls/doc/schema/rnc/EchoResponse.rnc
===================================================================
--- trunk/geant2_java-xml-ls/doc/schema/rnc/EchoResponse.rnc    2008-01-07 
13:38:29 UTC (rev 3181)
+++ trunk/geant2_java-xml-ls/doc/schema/rnc/EchoResponse.rnc    2008-01-07 
13:40:31 UTC (rev 3182)
@@ -8,7 +8,8 @@
         Identifier? &
         MessageIdentifierRef? &
         Type? &
-        (Metadata&Data)
+        Metadata+ &
+        Data+
 
 Identifier =
         attribute id { xsd:string }
@@ -21,16 +22,15 @@
 
 Metadata =
         element nmwg:metadata {
-                (       Identifier &
-                        MetadataIdentifierRef
-                ) &
-                EventTypeResultCode
+                  Identifier &
+                  MetadataIdentifierRef? &
+                  ResultCode
         }
 
 MetadataIdentifierRef =
         attribute metadataIdRef { xsd:string }
 
-EventTypeResultCode =
+ResultCode =
         element nmwg:eventType { xsd:string }
 
 Data =
@@ -41,4 +41,4 @@
         }
 
 ResultCodeDatum =
-        element nmwg:datum { xsd:string }
\ No newline at end of file
+        element nmwgr:datum { xsd:string }
\ No newline at end of file

Modified: trunk/geant2_java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc
===================================================================
--- trunk/geant2_java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc     
2008-01-07 13:38:29 UTC (rev 3181)
+++ trunk/geant2_java-xml-ls/doc/schema/rnc/LSDeregisterRequest.rnc     
2008-01-07 13:40:31 UTC (rev 3182)
@@ -26,11 +26,14 @@
         }
 
 Key =
-        element nmwg:key { ParametersBlock }
+        element nmwg:key { 
+            Identifier? & 
+            ParametersBlock 
+        }
 
 ParametersBlock = 
         element nmwg:parameters {
-            Identifier &
+            Identifier? &
             Parameter+ 
         }
 

Added: trunk/geant2_java-xml-ls/doc/schema/rnc/LSDeregisterResponse.rnc

Added: trunk/geant2_java-xml-ls/doc/schema/rnc/LSKeepaliveResponse.rnc

Added: trunk/geant2_java-xml-ls/doc/schema/rnc/LSQueryResponse.rnc

Modified: trunk/geant2_java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc
===================================================================
--- trunk/geant2_java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc       
2008-01-07 13:38:29 UTC (rev 3181)
+++ trunk/geant2_java-xml-ls/doc/schema/rnc/LSRegisterRequest.rnc       
2008-01-07 13:40:31 UTC (rev 3182)
@@ -1,4 +1,3 @@
-
 namespace nmwg="http://ggf.org/ns/nmwg/base/2.0/";
 namespace nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
 namespace psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
@@ -26,10 +25,7 @@
         element nmwg:metadata {
               Identifier &
               MetadataIdentifierRef? &
-              (
-                 ServiceSubject |        # WILL BE NEVER USED!
-                 AnyElement*
-              ) 
+              AnyElement*
                   
         }
 
@@ -45,25 +41,25 @@
 MetadataIdentifierRef =
         attribute metadataIdRef { xsd:string }
 
-ServiceSubject = element perfsonar:subject {
-              Identifier? &
-              ServiceInfo
-        }
+#ServiceSubject = element perfsonar:subject {
+#              Identifier? &
+#              ServiceInfo
+#        }
+#
+# ServiceInfo =
+#        element psservice:service {
+#                (
+#                        Identifier? &
+#                        element psservice:serviceName        {text}   &
+#                        element psservice:accessPoint        {text}   &
+#                        element psservice:serviceType        {text}   &
+#                        element psservice:serviceDescription {text} ? &
+#                        element psservice:organization       {text} ? &
+#                        element psservice:contactEmail       {text} ? &
+#                        element psservice:serviceVersion     {text} ?
+#                )
+#        }
 
-ServiceInfo =
-        element psservice:service {
-                (
-                        Identifier? &
-                        element psservice:serviceName        {text}   &
-                        element psservice:accessPoint        {text}   &
-                        element psservice:serviceType        {text}   &
-                        element psservice:serviceDescription {text} ? &
-                        element psservice:organization       {text} ? &
-                        element psservice:contactEmail       {text} ? &
-                        element psservice:serviceVersion     {text} ?
-                )
-        }
-
 Data =
         element nmwg:data {
               Identifier &

Added: trunk/geant2_java-xml-ls/doc/schema/rnc/LSRegisterResponse.rnc