perfsonar development work

Author: trzaszcz
Date: 2009-12-01 07:44:35 -0500 (Tue, 01 Dec 2009)
New Revision: 5367

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/pom.xml
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
Log:
refactoring, comments

Modified: branches/new-structure-with-base2/ps-mdm-ls/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-12-01 11:48:49 
UTC (rev 5366)
+++ branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-12-01 12:44:35 
UTC (rev 5367)
@@ -176,7 +176,7 @@
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>findbugs-maven-plugin</artifactId>
-                               <version>2.0.1</version>
+                               <version>2.2</version>
                                <configuration>
                                        <xmlOutput>true</xmlOutput>
                                        
<xmlOutputDirectory>target/site</xmlOutputDirectory>

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2009-12-01 11:48:49 UTC (rev 5366)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2009-12-01 12:44:35 UTC (rev 5367)
@@ -57,7 +57,7 @@
                Message request = serviceRequest.getMessageElement();
 
                // lsTTL param processing
-
+               //TODO: refactoring ... <- move to method 
                List<Element> parametersNodes = (List<Element>) serviceRequest
                                .getElement().getChildren("parameters");
                if (parametersNodes != null && parametersNodes.size() == 1) {

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2009-12-01 11:48:49 UTC (rev 5366)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2009-12-01 12:44:35 UTC (rev 5367)
@@ -18,7 +18,7 @@
  */
 public class LSSummaryRegisterDataSource implements RegisterDataSource {
 
-       protected static final Logger logger = Logger
+       private final Logger logger = Logger
                        .getLogger(LSSummaryRegisterDataSource.class);
 
        protected SummarizationDAO dao;

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
  2009-12-01 11:48:49 UTC (rev 5366)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/MultipleFilesExistDAOImpl.java
  2009-12-01 12:44:35 UTC (rev 5367)
@@ -87,7 +87,8 @@
                } catch (NoSuchAlgorithmException e) {
                        throw new PerfSONARException("md5 - algorithm not 
found",e);
                }
-
+               
+               //TODO: improve this query 
                String xquery = XQUERY_DECLARE_NAMESPACES + " for $i in  " + 
"("
                                + 
"/nmwg:store[@type='"
 + LS_STORE_CONTROL_COLLECTION_TYPE
                                + 
"']/nmwg:metadata[@id='"
 + metadataId + "']" + ", "

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 11:48:49 UTC (rev 5366)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
     2009-12-01 12:44:35 UTC (rev 5367)
@@ -156,9 +156,17 @@
                 <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>