perfsonar development work

Author: trzaszcz
Date: 2009-10-14 04:20:19 -0400 (Wed, 14 Oct 2009)
New Revision: 5309

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/SummarizationDAO.java
Removed:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/ISummarizationDAO.java
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/storage/LookupServiceDAOFactory.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
Log:
refactoring

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-10-14 08:17:33 UTC (rev 5308)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2009-10-14 08:20:19 UTC (rev 5309)
@@ -7,7 +7,7 @@
 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.ISummarizationDAO;
+import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;
 
 /**
@@ -21,7 +21,7 @@
        protected static final Logger logger = Logger
                        .getLogger(LSSummaryRegisterDataSource.class);
 
-       protected ISummarizationDAO dao;
+       protected SummarizationDAO dao;
 
        public LSSummaryRegisterDataSource() throws PerfSONARException {
                super();

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

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAOFactory.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAOFactory.java
  2009-10-14 08:17:33 UTC (rev 5308)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/LookupServiceDAOFactory.java
  2009-10-14 08:20:19 UTC (rev 5309)
@@ -7,7 +7,7 @@
 
        private static LookupServiceDAO dao = null;
        private static LookupServiceDAO daoRO = null;
-       private static ISummarizationDAO summariaztionDAO=null;
+       private static SummarizationDAO summariaztionDAO=null;
        
        private final static String LS_DAO = "lsdao";
        private final static String LS_DAO_RO = "lsdao-ro";
@@ -46,13 +46,13 @@
                }
        }
        
-       public static ISummarizationDAO getSumarizationDAO() throws 
PerfSONARException {
+       public static SummarizationDAO getSumarizationDAO() throws 
PerfSONARException {
 
                if (summariaztionDAO != null) {
                        return summariaztionDAO;
                } else {
                        try {
-                               summariaztionDAO = (ISummarizationDAO) 
ConfigurationManager.getInstance()
+                               summariaztionDAO = (SummarizationDAO) 
ConfigurationManager.getInstance()
                                                
.getConfiguration().getAuxiliaryComponent(SUMMARIZATION_DAO);
                                return summariaztionDAO;
                        } catch (Exception ex) {

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


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

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
       2009-10-14 08:17:33 UTC (rev 5308)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/SummarizationDAOImpl.java
       2009-10-14 08:20:19 UTC (rev 5309)
@@ -8,10 +8,10 @@
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.ElementSerializer;
 import org.perfsonar.base2.xml.StringBufferOutputStream;
-import org.perfsonar.service.lookupservice.storage.ISummarizationDAO;
+import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 
 public class SummarizationDAOImpl extends XQueryExistDAOImpl implements
-               ISummarizationDAO {
+               SummarizationDAO {
 
        /**
         * The name of the summary collection of LS

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
     2009-10-14 08:17:33 UTC (rev 5308)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/LSSummarySynchronizationAction.java
     2009-10-14 08:20:19 UTC (rev 5309)
@@ -7,7 +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.storage.ISummarizationDAO;
+import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;
 
 /**
@@ -30,7 +30,7 @@
        private int iteration = 0;
        private boolean firstIteration=true;
        private boolean initialized=false;
-       private ISummarizationDAO summarizationDao;
+       private SummarizationDAO summarizationDao;
        private SummarizationBuilder builder;
        private ModificationCounterComponent component;
 

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
       2009-10-14 08:17:33 UTC (rev 5308)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/summarization/SummarizationBuilder.java
       2009-10-14 08:20:19 UTC (rev 5309)
@@ -15,7 +15,7 @@
 import org.perfsonar.base2.xml.nmwg.Message;
 import 
org.perfsonar.service.lookupservice.registration.DiscoveryRequestGenerator;
 import 
org.perfsonar.service.lookupservice.registration.summarization.SummarizeIpAddrs;
-import org.perfsonar.service.lookupservice.storage.ISummarizationDAO;
+import org.perfsonar.service.lookupservice.storage.SummarizationDAO;
 
 public class SummarizationBuilder {
 
@@ -27,10 +27,10 @@
        private static final int EVENT_TYPE = 300;
        private static final int KEYWORD = 400;
 
-       protected ISummarizationDAO dao;
+       protected SummarizationDAO dao;
        
        
-       public SummarizationBuilder(ISummarizationDAO dao){
+       public SummarizationBuilder(SummarizationDAO dao){
                this.dao = dao;
        }