perfsonar development work

Author: mac
Date: 2008-01-11 08:58:27 -0500 (Fri, 11 Jan 2008)
New Revision: 3213

Modified:
   trunk/geant2_java-xml-ls/samples/requests/LSQueryRequest.xml
   trunk/geant2_java-xml-ls/samples/requests/LSRegisterRequest.xml
Log:
minor changes

Modified: trunk/geant2_java-xml-ls/samples/requests/LSQueryRequest.xml
===================================================================
--- trunk/geant2_java-xml-ls/samples/requests/LSQueryRequest.xml        
2008-01-11 13:57:54 UTC (rev 3212)
+++ trunk/geant2_java-xml-ls/samples/requests/LSQueryRequest.xml        
2008-01-11 13:58:27 UTC (rev 3213)
@@ -37,26 +37,5 @@
 
 
 
-<!--
-  <nmwg:metadata id="meta2">
-  
-    <xquery:subject id="sub1">
-      declare namespace 
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/'; 
-      declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/'; 
-      declare namespace 
psservice='http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/'; 
-      declare namespace nmwgt='http://ggf.org/ns/nmwg/topology/2.0/'; 
-      declare namespace 
netutil='http://ggf.org/ns/nmwg/characteristic/utilization/2.0/'; 
-
-      
data(/nmwg:store[@type='LSStore']/nmwg:metadata/@id)
-            
-    </xquery:subject>
-    <nmwg:eventType>service.lookup.xquery</nmwg:eventType>
-    
-  </nmwg:metadata>
-  
-  <nmwg:data metadataIdRef="meta2" id="d2"/>
--->
-
-
 </nmwg:message>
 

Modified: trunk/geant2_java-xml-ls/samples/requests/LSRegisterRequest.xml
===================================================================
--- trunk/geant2_java-xml-ls/samples/requests/LSRegisterRequest.xml     
2008-01-11 13:57:54 UTC (rev 3212)
+++ trunk/geant2_java-xml-ls/samples/requests/LSRegisterRequest.xml     
2008-01-11 13:58:27 UTC (rev 3213)
@@ -1,10 +1,10 @@
 <nmwg:message type="LSRegisterRequest"
     xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-    xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
+    xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";        
            
     xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
     xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
     xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
-    
+  
     <nmwg:metadata id="meta1">
         <perfsonar:subject id="subj.15977808">
             <psservice:service id="229.148.249.60.16283379">
@@ -12,6 +12,9 @@
                 
<psservice:accessPoint>http://shower.fr:8080/axis/services/MeasurementArchiveService</psservice:accessPoint>
                 <psservice:serviceType>MA</psservice:serviceType>
                 <psservice:serviceDescription>Java RRD MA, perfSONAR 
project, 229.148.249.60</psservice:serviceDescription>
+                <psservice:organization>Shower 
France</psservice:organization>
+                
<psservice:contactEmail></psservice:contactEmail>
+                <psservice:serviceVersion>1.5</psservice:serviceVersion>
             </psservice:service>
         </perfsonar:subject>
     </nmwg:metadata>