perfsonar development work

Author: trzaszcz
Date: 2009-12-02 10:22:00 -0500 (Wed, 02 Dec 2009)
New Revision: 5369

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/dls/schedulerActions/
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/dls/schedulerActions/GLSRegistrationAction.java
Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest.xml
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
Log:
registration to GLS implementation

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest.xml
  2009-12-01 14:43:35 UTC (rev 5368)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/samples/requests/LSRegisterRequest.xml
  2009-12-02 15:22:00 UTC (rev 5369)
@@ -5,12 +5,10 @@
     xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
     xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
  
-
    <nmwg:parameters>
        <nmwg:parameter name="lsTTL">10000</nmwg:parameter>
    </nmwg:parameters>
 
-
     <nmwg:metadata id="meta1">
         <perfsonar:subject id="subj.15977808">
             <psservice:service id="229.148.249.60.16283379">

Added: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/dls/schedulerActions/GLSRegistrationAction.java

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
       2009-12-01 14:43:35 UTC (rev 5368)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java
       2009-12-02 15:22:00 UTC (rev 5369)
@@ -13,6 +13,11 @@
        
        private int counter=0;
        
+       /**
+        * nr of changes since last GLS registration
+        */
+       private int diffsBetweenRegistrationCounter=0;
+       
        private final Logger 
logger=Logger.getLogger(ModificationCounterComponent.class);
        
        @Override
@@ -29,6 +34,7 @@
        @Override
        public void init() throws PerfSONARException {
                counter=0;
+               diffsBetweenRegistrationCounter=0;
        }
        
        /**
@@ -39,6 +45,7 @@
         */
        public void increaseCounter(){
                counter++;
+               diffsBetweenRegistrationCounter++;
                logger.debug("Counter increased "+counter);
        }
        /**
@@ -49,8 +56,20 @@
                counter=0;
        }
        
+       /**
+        * resets diffsBetweenRegistration counter. This method is invoked 
after registration to GLS
+        * 
+        */
+       public void resetDiffsBetweenRegistrationCounter(){
+               diffsBetweenRegistrationCounter=0;
+       }
+       
        public int getCounter() {
                return counter;
        }
        
+       public int getDiffsBetweenRegistrationCounter() {
+               return diffsBetweenRegistrationCounter;
+       }
+       
 }

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
     2009-12-01 14:43:35 UTC (rev 5368)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
     2009-12-02 15:22:00 UTC (rev 5369)
@@ -143,29 +143,38 @@
                 <option name="nrOfIterations" value="4"/> 
             </action>
            
-               
+               <!-- 
             <action name="registration" 
className="org.perfsonar.base2.service.registration.LSRegistrationAction">
-
+                        -->
+                        <action name="registration" 
className="org.perfsonar.service.lookupservice.dls.schedulerActions.GLSRegistrationAction">
+                        
                 <option name="status" value="on" />
+                <!-- 
                 <option name="interval" value="43200" />
-
+                               -->
+                               <option name="interval" value="432" />
+                               
+                               
                 <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="registerEventType"
                         
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/service/2.0"/>
+                 -->
                 <option name="registrator"
                         
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
                 
                 <!-- define lsAddresses (lsAddress-1,lsAddress-2,..) where 
this LS will be registered -->
-                
+                <!-- 
                 <option name="lsAddress-1"
                         
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
-                
+                 -->
                 <!-- or define localizations of the root.hints 
(lsList-1,lsList-2,...) which consists of gls addresses -->
                 
-                <!-- 
                 <option  name="lsList-1" 
value="http://www.perfsonar.net/gls.root.hints"/>
-                -->
                 
                 <option name="keyRefresh" value="0"/>
             </action>