perfsonar development work

Author: dante.delvaux
Date: 2012-11-23 13:48:36 +0000 (Fri, 23 Nov 2012)
New Revision: 6034

Added:
   trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-ServiceData.xml
   trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Services.xml
Removed:
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/FileTestServiceServiceEngine.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java
Modified:
   trunk/perfsonar-java-xml-ls/
   trunk/perfsonar-java-xml-ls/pom.xml
   trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/AbstractRegisterServiceEngine.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceROEngine.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDeregisterServiceEngine.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDiscoveryAction.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSQueryAction.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/DataSourceComponent.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/ModificationCounterComponent.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/JoinRequestGenerator.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/UpdateTokenRequestGenerator.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Constants.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/DomainSummarizator.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAOFactory.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/SummarizationDAO.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/SummarizationDAOImpl.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummaryBean.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/utilities/ResourceBundle.java
Log:
Adding comments pending refactoring of pSbase.
Removing unused files/classes.
Adding LS query sample messages.


Property changes on: trunk/perfsonar-java-xml-ls
___________________________________________________________________
Modified: svn:ignore
   - target

.classpath

.project

.settings

.gitignore

.externalToolBuilders

logs

   + target

.classpath

.project

.settings

.gitignore

.externalToolBuilders

logs

.idea


Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2012-11-19 07:56:20 UTC (rev 6033)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2012-11-23 13:48:36 UTC (rev 6034)
@@ -347,14 +347,18 @@
                </pluginRepository>
        </pluginRepositories>
 
-       <distributionManagement>
-               <repository>
-                       <id>geant-developers-repository</id>
-                       <name>perfSONAR repository</name>
-                       
<url>scpexe:///repo</url>
-                       <uniqueVersion>false</uniqueVersion>
-               </repository>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>GEANT Artifactory</id>
+            <name>GEANT Artifactory perfSONAR-release</name>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local</url>
+        </repository>
+        <snapshotRepository>
+            <id>GEANT Artifactory</id>
+            <name>GEANT Artifactory perfSONAR-snapshots</name>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-snapshot-local</url>
+        </snapshotRepository>
+    </distributionManagement>
 
        <dependencies>
                <dependency>

Added: 
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-ServiceData.xml
===================================================================
--- 
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-ServiceData.xml   
                      (rev 0)
+++ 
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-ServiceData.xml 
2012-11-23 13:48:36 UTC (rev 6034)
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Return the data of a registered Service (give with its id) -->
+
+<nmwg:message type="LSQueryRequest"
+              id="msg1"
+              xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+              
xmlns:xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";>
+                                                                             
                                                     
+  <nmwg:metadata id="meta1">
+  
+    <xquery:subject id="sub1">
+      declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/'; 
+      declare namespace 
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/'; 
+      declare namespace 
psservice='http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/'; 
+      declare namespace 
xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";;
+            
+        let $metadata := 
/nmwg:store/nmwg:metadata[perfsonar:subject/psservice:service/psservice:accessPoint='http://perfsonar-ma.geant.net:8080/geant2-java-sql-ma/services/MeasurementArchiveService']
+        let $metadata_id := $metadata/@id
+        let $data := 
/nmwg:store/nmwg:data[@metadataIdRef=$metadata_id]
+
+        return $data
+
+    </xquery:subject>
+
+    <xquery:parameters id="param.1">
+        <xquery:parameter name="lsOutput">native</xquery:parameter>
+    </xquery:parameters>
+
+       
<nmwg:eventType>http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0</nmwg:eventType>
+  </nmwg:metadata>
+  
+  <nmwg:data metadataIdRef="meta1" id="d1"/>
+
+</nmwg:message>


Property changes on: 
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-ServiceData.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: 
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Services.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Services.xml  
                          (rev 0)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Services.xml  
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Return the list of registered Services of the given type (here 'ma') -->
+<!-- For this to work, services needs to be registering with a correct 
serviceType, of course! -->
+
+<nmwg:message type="LSQueryRequest"
+              id="msg1"
+              xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+              
xmlns:xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";>
+                                                                             
                                                     
+  <nmwg:metadata id="meta1">
+  
+    <xquery:subject id="sub1">
+      declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/'; 
+      declare namespace 
perfsonar='http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/'; 
+      declare namespace 
psservice='http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/'; 
+      declare namespace 
xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";;
+            
+        let $metadata := 
/nmwg:store/nmwg:metadata[matches(descendant::psservice:serviceType, 'ma', 
'i')]
+        let $metadata_id := $metadata/@id
+        let $data := 
/nmwg:store/nmwg:data[@metadataIdRef=$metadata_id]
+
+        return $metadata/perfsonar:subject/psservice:service
+<!-- Use the following return, if you're only interested in getting the 
Access Point URL -->
+<!--    return 
data($metadata/perfsonar:subject/psservice:service/psservice:accessPoint) -->
+    </xquery:subject>
+
+    <xquery:parameters id="param.1">
+        <xquery:parameter name="lsOutput">native</xquery:parameter>
+    </xquery:parameters>
+
+       
<nmwg:eventType>http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/query/xquery/2.0</nmwg:eventType>
+  </nmwg:metadata>
+  
+  <nmwg:data metadataIdRef="meta1" id="d1"/>
+
+</nmwg:message>


Property changes on: 
trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest-Services.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml     
2012-11-19 07:56:20 UTC (rev 6033)
+++ trunk/perfsonar-java-xml-ls/samples/requests/LSQueryRequest.xml     
2012-11-23 13:48:36 UTC (rev 6034)
@@ -1,4 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--  This query returns all the meatadata elements stored in a LS -->
+<!--  The return should be the full list of services registered to the LS -->
 
 <nmwg:message type="LSQueryRequest"
               id="msg1"
@@ -8,13 +10,13 @@
   <nmwg:metadata id="meta1">
   
     <xquery:subject id="sub1">
+      declare namespace nmwg='http://ggf.org/ns/nmwg/base/2.0/'; 
       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)
+      
/nmwg:store[@type='LSStore']/nmwg:metadata
     </xquery:subject>
 
     <xquery:parameters id="param.1">

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/AbstractRegisterServiceEngine.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/AbstractRegisterServiceEngine.java
    2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/AbstractRegisterServiceEngine.java
    2012-11-23 13:48:36 UTC (rev 6034)
@@ -1,7 +1,5 @@
-
 package org.perfsonar.service.lookupservice;
 
-
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.requesthandler.ServiceEngine;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java
  2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/DiscoveryQueryGenerator.java
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -6,6 +6,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.xml.Element;
 

Deleted: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/FileTestServiceServiceEngine.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/FileTestServiceServiceEngine.java
     2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/FileTestServiceServiceEngine.java
     2012-11-23 13:48:36 UTC (rev 6034)
@@ -1,46 +0,0 @@
-package org.perfsonar.service.lookupservice;
-
-
-import java.io.FileInputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.perfsonar.base2.service.exceptions.PerfSONARException;
-import org.perfsonar.base2.service.requesthandler.ServiceEngine;
-import org.perfsonar.base2.service.requesthandler.ServiceMessage;
-import org.perfsonar.base2.service.util.ResultCodesUtil;
-import org.perfsonar.base2.xml.ConfigurationStaxParser;
-import org.perfsonar.base2.xml.nmwg.Message;
-
-
-/**
- * Test
- */
-public class FileTestServiceServiceEngine implements ServiceEngine {
-
-       protected Logger logger = LoggerFactory.getLogger(getClass());
-    private String outFile = "/tmp/response.xml";
-
-    public void takeAction(ServiceMessage serviceRequest, ServiceMessage 
serviceResponse)
-        throws PerfSONARException {
-
-        logger.info("!!! Test service engine, reply with file ["+outFile+"] 
content.");
-
-        ConfigurationStaxParser sp = new ConfigurationStaxParser();
-        Message msg;
-        try {
-            msg = (Message)sp.parse(new FileInputStream(outFile));
-        } catch (Exception e1) {
-            logger.warn("TEST: exception while reading file ["+outFile+"] : 
["+
-                    e1.getMessage()+"], sending [error/gls/test]");
-//             TODO: url event types
-             msg = ResultCodesUtil.generateResultMessage(null, 
-                    "error.gls.test", "Cannot read or parse file 
["+outFile+"]");
-        }
-
-        serviceResponse.setElement(msg);
-
-    }
-
-
-}

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java
   2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceEngine.java
   2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.configuration.Configuration;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
@@ -9,6 +10,7 @@
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.base2.xml.nmwg.Metadata;
+
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceROEngine.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceROEngine.java
 2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/GenericLSServiceROEngine.java
 2012-11-23 13:48:36 UTC (rev 6034)
@@ -1,8 +1,10 @@
 package org.perfsonar.service.lookupservice;
 
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
+
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;
+
 /**
  * 
  * Service provides read only operation on Exist DB

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDeregisterServiceEngine.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDeregisterServiceEngine.java
        2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDeregisterServiceEngine.java
        2012-11-23 13:48:36 UTC (rev 6034)
@@ -6,6 +6,7 @@
 import org.perfsonar.base2.service.util.ResultCodesUtil;
 import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.base2.xml.nmwg.Metadata;
+
 import 
org.perfsonar.service.lookupservice.components.ModificationCounterComponent;
 
 /**

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDiscoveryAction.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDiscoveryAction.java
        2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSDiscoveryAction.java
        2012-11-23 13:48:36 UTC (rev 6034)
@@ -5,6 +5,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
@@ -12,6 +13,7 @@
 import org.perfsonar.base2.xml.nmwg.Data;
 import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.base2.xml.nmwg.Metadata;
+
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 
 /**

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSQueryAction.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSQueryAction.java
    2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSQueryAction.java
    2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
@@ -9,6 +10,7 @@
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.nmwg.Data;
 import org.perfsonar.base2.xml.nmwg.Message;
+
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 
 /**

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -10,6 +10,7 @@
 import org.perfsonar.base2.xml.nmwg.EventType;
 import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.base2.xml.nmwg.Metadata;
+
 import 
org.perfsonar.service.lookupservice.components.ModificationCounterComponent;
 import 
org.perfsonar.service.lookupservice.registerService.LSRegisterServiceHelper;
 import org.perfsonar.service.lookupservice.registration.LsTTLParameterStatus;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java
     2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegistrationMessageHandler.java
     2012-11-23 13:48:36 UTC (rev 6034)
@@ -8,6 +8,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.messages.GenericMessageHandler;
 import org.perfsonar.base2.xml.Element;

Deleted: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java
      2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/ThreadPoolComponent.java
      2012-11-23 13:48:36 UTC (rev 6034)
@@ -1,52 +0,0 @@
-package org.perfsonar.service.lookupservice;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.perfsonar.base2.service.configuration.Component;
-import org.perfsonar.base2.service.exceptions.PerfSONARException;
-
-// TODO: this class is unused!!!
-public class ThreadPoolComponent extends Component {
-
-    private ExecutorService pool = null;
-
-    private int maximumNumberOfThreads = 5;
-
-    public void init() {
-
-        try {
-            maximumNumberOfThreads = 
this.getOption("max").getValueAsInteger();
-        } catch (Exception e) {
-               e.printStackTrace();
-        }
-
-        pool = Executors.newFixedThreadPool(maximumNumberOfThreads); 
-    }
-    
-    public void run(){
-       //do nothing
-    }
-
-
-    public void destroy() throws PerfSONARException {
-
-        pool.shutdownNow();
-        pool = null;
-    }
-
-
-    public int getMaximumNumberOfThreads() {
-
-        return maximumNumberOfThreads;
-    }
-
-    
-    public ExecutorService getPool() {
-    
-        return pool;
-    }
-
-
-    
-} //ThreadPoolComponent

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/DataSourceComponent.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/DataSourceComponent.java
   2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/DataSourceComponent.java
   2012-11-23 13:48:36 UTC (rev 6034)
@@ -5,6 +5,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.configuration.Component;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/ModificationCounterComponent.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/ModificationCounterComponent.java
  2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/ModificationCounterComponent.java
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -4,6 +4,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.configuration.Component;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
        2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
        2012-11-23 13:48:36 UTC (rev 6034)
@@ -10,8 +10,10 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.exist.xmldb.DatabaseInstanceManager;
 import org.exist.xmldb.LocalXPathQueryService;
+
 import org.perfsonar.base2.service.configuration.Component;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
@@ -19,6 +21,7 @@
 import org.perfsonar.base2.xml.ConfigurationStaxParser;
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.StaxParser;
+
 import org.xmldb.api.DatabaseManager;
 import org.xmldb.api.base.Collection;
 import org.xmldb.api.base.Database;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/JoinRequestGenerator.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/JoinRequestGenerator.java
  2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/JoinRequestGenerator.java
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,6 +2,19 @@
 
 import org.perfsonar.base2.xml.Element;
 
+/**
+ * This class is supposed to handle Join Requests needed for the dLS 
(distributed LS)
+ * network operation.  This feature is not implemented so far and it should 
be checked
+ * this class is the proper way to do it.  To be confronted with the LS 
client API and
+ * implementations done by SurfNET.
+ * 
+ * Commented on 20121006 - 

+ * 
+ * FIXME: check we need this.
+ * 
+ * @author unkown
+ *
+ */
 public class JoinRequestGenerator {
 
     // ----------------------------------------------------------------- 
fields

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/UpdateTokenRequestGenerator.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/UpdateTokenRequestGenerator.java
   2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/dls/client/UpdateTokenRequestGenerator.java
   2012-11-23 13:48:36 UTC (rev 6034)
@@ -5,6 +5,19 @@
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.xml.Element;
 
+/**
+ * This class is supposed to handle Tokens needed for the dLS (distributed 
LS)
+ * network operation.  This feature is not implemented so far and it should 
be checked
+ * this class is the proper way to do it.  To be confronted with the LS 
client API and
+ * implementations done by SurfNET.
+ * 
+ * Commented on 20121006 - 

+ * 
+ * FIXME: check we need this.
+ * 
+ * @author unkown
+ *
+ */
 public class UpdateTokenRequestGenerator {
 
     // ----------------------------------------------------------------- 
fields

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
  2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -15,6 +15,7 @@
 import org.perfsonar.base2.xml.nmwg.Parameter;
 import org.perfsonar.base2.xml.nmwg.Parameters;
 import org.perfsonar.base2.xml.nmwg.Subject;
+
 import org.perfsonar.service.lookupservice.AbstractRegisterServiceEngine;
 import org.perfsonar.service.lookupservice.registration.LsTTLParameterStatus;
 import org.perfsonar.service.utilities.ResourceBundle;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,12 +2,14 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.registration.RegisterDataSource;
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.nmwg.Message;
+
 import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
        2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
        2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,6 +2,14 @@
 
 import java.util.Locale;
 
+/**
+ * Is it the proper way to do that?  Can't we make it a bit more 
lightweighted with Constants?
+ * 
+ * Commented on 20121006 - 

+ *
+ * FIXME: check we need this.
+ * 
+ */
 public enum LsTTLParameterStatus {
        NONE, ACCEPTED, OUT_OF_BOUND, NOT_A_NUMBER;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Constants.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Constants.java
     2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/Constants.java
     2012-11-23 13:48:36 UTC (rev 6034)
@@ -1,10 +1,15 @@
 package org.perfsonar.service.lookupservice.registration.summarization;
 
 /**
- * Summarization code
+ * Constants for the summarization code
  * 
  * @author swany
  *
+ * FIXME: not sure this is the proper way to do it, shouldn't this be a 
"public final class" instead?
+ * We should properly group all service related constants in a single file 
and rename the class to
+ * something a bit more descriptive like "LSConstants"
+ * Commented on 2012106 - 

+ * 
  */
 interface Constants {
     public final static int MAX_KEY_LENGTH = 32;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/DomainSummarizator.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/DomainSummarizator.java
    2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/DomainSummarizator.java
    2012-11-23 13:48:36 UTC (rev 6034)
@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+
 /**
  *
  * builds domains summary

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java
     2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/IPAddress.java
     2012-11-23 13:48:36 UTC (rev 6034)
@@ -1,6 +1,5 @@
 package org.perfsonar.service.lookupservice.registration.summarization;
 
-
 /**
  * 
  * Representation of the IP address, stores address IP (in string,long form)

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
  2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,11 +2,13 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.configuration.Action;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.configuration.Option;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.scheduler.SchedulerAction;
+
 import 
org.perfsonar.service.lookupservice.components.ModificationCounterComponent;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
   2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
   2012-11-23 13:48:36 UTC (rev 6034)
@@ -7,6 +7,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.configuration.Option;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
@@ -14,6 +15,7 @@
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.nmwg.Message;
+
 import 
org.perfsonar.service.lookupservice.components.ModificationCounterComponent;
 
 /**

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
    2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
    2012-11-23 13:48:36 UTC (rev 6034)
@@ -7,6 +7,7 @@
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.scheduler.SchedulerAction;
 import org.perfsonar.base2.xml.Element;
+
 import 
org.perfsonar.service.lookupservice.components.ModificationCounterComponent;
 import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
       2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
       2012-11-23 13:48:36 UTC (rev 6034)
@@ -8,18 +8,22 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.xmldb.api.base.Collection;
+import org.xmldb.api.base.XMLDBException;
+import org.xmldb.api.modules.CollectionManagementService;
+import org.xmldb.api.modules.XMLResource;
+
 import org.exist.security.User;
 import org.exist.xmldb.UserManagementService;
 import org.exist.xmldb.XmldbURI;
+
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
+
 import org.perfsonar.service.lookupservice.components.DataSourceComponent;
 import org.perfsonar.service.lookupservice.components.XMLDBComponent;
+
 import org.perfsonar.webadmin.base2.servlet.BasicServlet;
-import org.xmldb.api.base.Collection;
-import org.xmldb.api.base.XMLDBException;
-import org.xmldb.api.modules.CollectionManagementService;
-import org.xmldb.api.modules.XMLResource;
 
 /**
  * This servlet initializes eXist database

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAOFactory.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAOFactory.java
  2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAOFactory.java
  2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.configuration.Component;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/SummarizationDAO.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/SummarizationDAO.java
 2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/SummarizationDAO.java
 2012-11-23 13:48:36 UTC (rev 6034)
@@ -5,6 +5,7 @@
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
 import org.perfsonar.base2.xml.Element;
+
 /**
  *
  * DAO service for Summarization

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
       2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
       2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,11 +2,13 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.configuration.Component;
 import org.perfsonar.base2.service.configuration.ConfigurationManager;
 import org.perfsonar.base2.service.configuration.Option;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
+
 import org.perfsonar.service.lookupservice.components.XMLDBComponent;
 import org.perfsonar.service.lookupservice.storage.XQueryDAOSupport;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
   2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
   2012-11-23 13:48:36 UTC (rev 6034)
@@ -13,6 +13,7 @@
 import org.perfsonar.base2.xml.StringBufferOutputStream;
 import org.perfsonar.base2.xml.nmwg.Data;
 import org.perfsonar.base2.xml.nmwg.Metadata;
+
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 import 
org.perfsonar.service.lookupservice.storage.exist.XQueryDAOSupportImpl;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/SummarizationDAOImpl.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/SummarizationDAOImpl.java
   2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/SummarizationDAOImpl.java
   2012-11-23 13:48:36 UTC (rev 6034)
@@ -11,6 +11,7 @@
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.ElementSerializer;
 import org.perfsonar.base2.xml.StringBufferOutputStream;
+
 import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 import 
org.perfsonar.service.lookupservice.storage.exist.XQueryDAOSupportImpl;
 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummaryBean.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummaryBean.java
 2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ServiceSummaryBean.java
 2012-11-23 13:48:36 UTC (rev 6034)
@@ -2,6 +2,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
 /**
  * Contains summary from a single service
  * 

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
       2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
       2012-11-23 13:48:36 UTC (rev 6034)
@@ -9,9 +9,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.nmwg.Message;
+
 import 
org.perfsonar.service.lookupservice.registration.DiscoveryRequestGenerator;
 import 
org.perfsonar.service.lookupservice.registration.summarization.DomainSummarizator;
 import 
org.perfsonar.service.lookupservice.registration.summarization.SummarizeIpAddrs;

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/utilities/ResourceBundle.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/utilities/ResourceBundle.java
       2012-11-19 07:56:20 UTC (rev 6033)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/utilities/ResourceBundle.java
       2012-11-23 13:48:36 UTC (rev 6034)
@@ -3,11 +3,15 @@
 import java.text.MessageFormat;
 
 /**
- * 
  * Provides opportunity to read messages from properties files
  * 
  * @author Slawomir Trzaszczka
  * 
+ * Commented on 20121006 - 

+ * This class is only used once and only to read the lsTTL parameter strings 
from
+ * resources/org/perfsonar/resources/resources.properties that actually 
should be constants!
+ * FIXME: to be removed completely, along with the previous file
+ * 
  */
 public class ResourceBundle {