perfsonar development work

Author: mac
Date: 2009-03-17 10:30:46 -0400 (Tue, 17 Mar 2009)
New Revision: 5092

Removed:
   branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-ls.xml
Modified:
   branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
Log:
Configuration file for LS




Deleted: branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-ls.xml

Modified: branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml  
2009-03-17 14:22:43 UTC (rev 5091)
+++ branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml  
2009-03-17 14:30:46 UTC (rev 5092)
@@ -35,9 +35,7 @@
       <message type="LSRegisterRequest"
                
handler="org.perfsonar.service.lookupservice.LSRegistrationMessageHandler">
         <option name="ServiceEngine" 
-                
value="org.perfsonar.service.lookupservice.FileTestServiceServiceEngine"/>  
-        <!-- option name="ServiceEngine" 
-                
value="org.perfsonar.service.lookupservice.LSRegisterServiceEngine" /-->  
+                
value="org.perfsonar.service.lookupservice.LSRegisterServiceEngine"/>  
         <option name="authN" value="no" />
       </message>     
       
@@ -91,7 +89,7 @@
         <option name="username"    value="lookupservice"/>
         <option name="password"    value="sonar"/>
       </component>          
-      
+
       <!-- Lookup Service DAO -->
       <component name="lsdao" 
                  
className="org.perfsonar.service.lookupservice.storage.exist.XQueryExistDAOImpl">
@@ -106,21 +104,26 @@
         <option name="interval" value="60"/> <!-- sec -->
         
         <actions>
-            <!--
+            
             <action name="LSCleanup_1" 
className="org.perfsonar.service.lookupservice.LSCleanupSchedulerAction">
+                <option name="status" value="off" />
+                <option name="interval" value="45" />
                 <option name="lsTTL" value="360"/> 
-                <option name="interval" value="45" />
             </action>
-            -->
            
         
             <action name="registration" 
className="org.perfsonar.base2.service.registration.LSRegistrationAction">
 
+                <option name="status" value="on" />
                 <option name="interval" value="3600" />
+
                 <option name="registerDataSource"
                         
value="org.perfsonar.service.lookupservice.registration.LSSummaryRegisterDataSource"/>
+                <option name="registerEventType"
+                        
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
                 <option name="registrator"
                         
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+                
                 <option name="lsAddress-1"
                         value="http://localhost:8080/axis2/services/xmlls"/>