perfsonar development work

Author: mac
Date: 2009-03-06 10:24:48 -0500 (Fri, 06 Mar 2009)
New Revision: 5036

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSDeregisterRequest.xml
   
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSKeepaliveRequest.xml
   
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest-Update.xml
   
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest.xml
   branches/new-structure-with-base2/ps-mdm-ls/samples/store/
   branches/new-structure-with-base2/ps-mdm-ls/samples/store/sample/
   
branches/new-structure-with-base2/ps-mdm-ls/samples/store/sample/LSStore-control.xml
   
branches/new-structure-with-base2/ps-mdm-ls/samples/store/sample/LSStore.xml
Modified:
   branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-rules.xml
   
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest-Discovery.xml
   
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest.xml
Log:
configuration
sample requests and lsstore collection

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-rules.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-rules.xml  
  2009-03-06 15:22:11 UTC (rev 5035)
+++ branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-rules.xml  
  2009-03-06 15:24:48 UTC (rev 5036)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- $Id: configuration-rules.xml 4699 2008-11-20 13:32:22Z roman $ -->
+<!-- $Id: configuration-rules.xml 4892 2009-01-19 13:38:44Z roman $ -->
 
 <digester-rules>
 
@@ -133,6 +133,19 @@
     </pattern>
 
 
+    <pattern 
value="configuration/service/auxiliaryComponents/component/actions/action/option">
+        <object-create-rule
+            classname="org.perfsonar.base2.service.configuration.Option" />
+         <set-properties-rule>
+            <alias attr-name="name" prop-name="name"/>
+        </set-properties-rule>
+         <set-properties-rule>
+            <alias attr-name="value" prop-name="value"/>
+        </set-properties-rule>
+        <set-next-rule methodname="addOption" />
+    </pattern>
+
+
     <!-- protocolMappings -->
 
     <pattern value="configuration/service/protocolMappings">

Added: 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSDeregisterRequest.xml

Added: 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSKeepaliveRequest.xml

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest-Discovery.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest-Discovery.xml
   2009-03-06 15:22:11 UTC (rev 5035)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest-Discovery.xml
   2009-03-06 15:24:48 UTC (rev 5036)
@@ -16,7 +16,7 @@
 
 <!-- can have multiples of each, note that this creates an 'or' relationship 
-->
         <nmtb:address 
xmlns:nmtb="http://ogf.org/schema/network/topology/base/20070828/"; 
type="ipv4">128.4.133.167</nmtb:address>
-        <nmtb:address 
xmlns:nmtb="http://ogf.org/schema/network/topology/base/20070828/"type="ipv4";>128.4.100.45</nmtb:address>
+        <nmtb:address 
xmlns:nmtb="http://ogf.org/schema/network/topology/base/20070828/"; 
type="ipv4">128.4.100.45</nmtb:address>
 
         <nmtb:domain 
xmlns:nmtb="http://ogf.org/schema/network/topology/base/20070828/";>
           <nmtb:name type="dns">edu</nmtb:name>          

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest.xml
     2009-03-06 15:22:11 UTC (rev 5035)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSQueryRequest.xml
     2009-03-06 15:24:48 UTC (rev 5036)
@@ -1,18 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- Purpose:   LS Query Request, someone is looking for a service
-                so they will send a metadata that contains an xpath
-               expression as a subject.  After executing this on the
-               server side we should get some sort of response. -->
-<!-- Version:   $Id: LSQueryRequest.xml 4684 2008-11-03 13:07:33Z roman $ -->
-                                               
-<!-- ___________________________________________________ -->
-<!-- LS Query Request, someone is looking for a service  -->
-<!-- so they will send a metadata that contains an       -->
-<!-- xpath expression as a subject.  After executing     -->
-<!-- this on the server side we should get some sort of  -->
-<!-- response.                                           -->
-<!-- ___________________________________________________ -->
 <nmwg:message type="LSQueryRequest"
               id="msg1"
               xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
@@ -29,8 +16,10 @@
             
       
data(/nmwg:store[@type='LSStore']/nmwg:metadata/@id)
     </xquery:subject>
-    <nmwg:eventType>service.lookup.xquery</nmwg:eventType>
-    
+    
<nmwg:eventType>http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0</nmwg:eventType>
+    <xquery:parameters>
+       
+       <nmwg:parameters>
   </nmwg:metadata>
   
   <nmwg:data metadataIdRef="meta1" id="d1"/>

Added: 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest-Update.xml

Added: 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest.xml

Added: 
branches/new-structure-with-base2/ps-mdm-ls/samples/store/sample/LSStore-control.xml

Added: 
branches/new-structure-with-base2/ps-mdm-ls/samples/store/sample/LSStore.xml