perfsonar development work

Author: trzaszcz
Date: 2009-12-23 08:16:12 -0500 (Wed, 23 Dec 2009)
New Revision: 5431

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/ModificationCounterComponent.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/components/
   
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/components/DataSourceComponentTest.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/components/ModificationCounterComponentTest.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/components/XMLDBComponentTest.java
Removed:
   
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/test/java/org/perfsonar/tests/dao/ExistDbManagerTests.java
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/LSDeregisterServiceEngine.java
   
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/components/XMLDBComponent.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
Log:
refactoring

Modified: branches/new-structure-with-base2/ps-mdm-ls/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-12-23 12:43:52 
UTC (rev 5430)
+++ branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-12-23 13:16:12 
UTC (rev 5431)
@@ -99,7 +99,8 @@
                                                        
<targetPath>db</targetPath>
                                                </resource>
                                                <resource>
-                                                       
<directory>${project.build.directory}</directory>
+                                                       
<directory>${project.build.directory}
+                                                       </directory>
                                                        <includes>
                                                                
<include>**/*.aar</include>
                                                        </includes>

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSDeregisterServiceEngine.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSDeregisterServiceEngine.java
        2009-12-23 12:43:52 UTC (rev 5430)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSDeregisterServiceEngine.java
        2009-12-23 13:16:12 UTC (rev 5431)
@@ -7,7 +7,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.summarization.ModificationCounterComponent;
+import 
org.perfsonar.service.lookupservice.components.ModificationCounterComponent;
 
 /**
  * DEREGISTER Action

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-23 12:43:52 UTC (rev 5430)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2009-12-23 13:16:12 UTC (rev 5431)
@@ -11,9 +11,9 @@
 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;
-import 
org.perfsonar.service.lookupservice.summarization.ModificationCounterComponent;
 
 /**
  * REGISTER and UPDATE Action

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


Property changes on: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/ModificationCounterComponent.java
___________________________________________________________________
Name: svn:executable
   + *

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
        2009-12-23 12:43:52 UTC (rev 5430)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/components/XMLDBComponent.java
        2009-12-23 13:16:12 UTC (rev 5431)
@@ -39,7 +39,8 @@
        private String url;
        private String username;
        private String password;
-       private final String DATASOURCE_KEY = "dataSource-ref";
+       public final static String DATASOURCE_KEY = "dataSource-ref";
+       public final static String READ_ONLY_KEY = "readOnly";
        private XPathQueryService service;
 
        @Override
@@ -55,8 +56,8 @@
 
                        url = dataSource.getUrl();
 
-                       if (getOption("readOnly") != null
-                                       && 
getOption("readOnly").getValue().equals("true")) {
+                       if (getOption(READ_ONLY_KEY) != null
+                                       && 
getOption(READ_ONLY_KEY).getValue().equals("true")) {
                                logger.debug("readOnly compoenent");
                                username = dataSource.getUsernameRO();
                                password = dataSource.getPasswordRO();

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
  2009-12-23 12:43:52 UTC (rev 5430)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/CleanupSchedulerAction.java
  2009-12-23 13:16:12 UTC (rev 5431)
@@ -6,9 +6,9 @@
 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;
-import 
org.perfsonar.service.lookupservice.summarization.ModificationCounterComponent;
 
 /**
  * 

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
   2009-12-23 12:43:52 UTC (rev 5430)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/GLSRegistrationAction.java
   2009-12-23 13:16:12 UTC (rev 5431)
@@ -10,7 +10,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.summarization.ModificationCounterComponent;
+import 
org.perfsonar.service.lookupservice.components.ModificationCounterComponent;
 
 /**
  * 

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
    2009-12-23 12:43:52 UTC (rev 5430)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/schedulerActions/SummarySynchronizationAction.java
    2009-12-23 13:16:12 UTC (rev 5431)
@@ -7,9 +7,9 @@
 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;
-import 
org.perfsonar.service.lookupservice.summarization.ModificationCounterComponent;
 import 
org.perfsonar.service.lookupservice.summarization.SummarizationBuilder;
 
 /**

Deleted: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/ModificationCounterComponent.java

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-23 12:43:52 UTC (rev 5430)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
     2009-12-23 13:16:12 UTC (rev 5431)
@@ -109,7 +109,7 @@
       </component>     
       
       <!-- contains a nr of changes in DB - is used to synchronization  -->
-      <component name="modificationCounterComponent"  
className="org.perfsonar.service.lookupservice.summarization.ModificationCounterComponent"/>
+      <component name="modificationCounterComponent"  
className="org.perfsonar.service.lookupservice.components.ModificationCounterComponent"/>
    
       <!-- Scheduler -->
       <component name="scheduling"

Added: 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/components/DataSourceComponentTest.java

Added: 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/components/ModificationCounterComponentTest.java

Added: 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/components/XMLDBComponentTest.java

Deleted: 
branches/new-structure-with-base2/ps-mdm-ls/src/test/java/org/perfsonar/tests/dao/ExistDbManagerTests.java