perfsonar development work

Author: trzaszcz
Date: 2009-12-09 03:53:12 -0500 (Wed, 09 Dec 2009)
New Revision: 5387

Added:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/MultipleFilesDAOImpl.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/SingleFileDAOImpl.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/dao/SummarizationDAOImpl.java
Removed:
   
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/SummarizationDAOImpl.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryExistDAOImpl.java
Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
Log:
dao refactored,comments added

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

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

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
       2009-12-08 15:17:02 UTC (rev 5386)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/XQueryDAOSupportImpl.java
       2009-12-09 08:53:12 UTC (rev 5387)
@@ -2,12 +2,17 @@
 
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
-import org.perfsonar.service.lookupservice.storage.LookupServiceDAO;
 import org.perfsonar.service.lookupservice.storage.XQueryDAOSupport;
 
 public abstract class XQueryDAOSupportImpl extends CommonExistDAOImpl 
implements
-               XQueryDAOSupport, LookupServiceDAO {
+               XQueryDAOSupport{
 
+       protected static final String UPDATE_FOR = " for $i in ";
+       protected static final String UPDATE_REMOVE = " return (update delete 
$i, 'removed')";
+       protected static final String UPDATE_INSERT = " update insert ";
+       protected static final String UPDATE_INTO = " into ";
+       
+       
        public void uploadStoreFile(String name,String content){
                ExistDbManager.uploadStoreFile(name, content);
        }
@@ -75,7 +80,6 @@
                return !("0 0".equals(result));
        }
 
-       @Override
        public void setControlParameter(String metadataId, String parameter,
                        String value) throws PerfSONARException {
 

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

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

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

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


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

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-08 15:17:02 UTC (rev 5386)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
     2009-12-09 08:53:12 UTC (rev 5387)
@@ -96,19 +96,19 @@
        
       <!-- Lookup Service DAO -->
       <component name="lsdao" 
-                 
className="org.perfsonar.service.lookupservice.storage.exist.MultipleFilesExistDAOImpl">
+                 
className="org.perfsonar.service.lookupservice.storage.exist.dao.MultipleFilesDAOImpl">
         <option name="exist-config" value="exist"/> <!-- reference to eXist 
DB XML config-->
       </component>
       
       <!-- Lookup Service DAO with read-only permission. It is used in 
LSQueryRequest -->
       <component name="lsdao-ro" 
-                 
className="org.perfsonar.service.lookupservice.storage.exist.MultipleFilesExistDAOImpl">
+                 
className="org.perfsonar.service.lookupservice.storage.exist.dao.MultipleFilesDAOImpl">
         <option name="exist-config" value="exist-ro"/> <!-- reference to 
eXist DB XML config-->
       </component>
       
       <!-- Summarization Service DAO -->
       <component name="summarizationdao" 
-                 
className="org.perfsonar.service.lookupservice.storage.exist.SummarizationDAOImpl">
+                 
className="org.perfsonar.service.lookupservice.storage.exist.dao.SummarizationDAOImpl">
         <option name="exist-config" value="exist"/> <!-- reference to eXist 
DB XML config-->
       </component>     
       
@@ -124,7 +124,11 @@
         <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
         <option name="interval" value="60"/> <!-- sec -->
         <actions>
-            
+        
+            <!--
+                action invokes cleanup operations on database. lsTTL - 
default value of Time to live parameter.  
+               After lsTTL time, if service didn't re-register, service will 
be removed.
+             -->
             <action name="LSCleanup_1" 
className="org.perfsonar.service.lookupservice.schedulerActions.CleanupSchedulerAction">
                 <option name="status" value="on" />
                 <option name="interval" value="300" />
@@ -148,7 +152,6 @@
                 <option name="status" value="on" />
                 <option name="interval" value="43200" />
                                
-                               
                 <option name="registerDataSource"
                         
value="org.perfsonar.service.lookupservice.registration.LSSummaryRegisterDataSource"/>
                 
@@ -209,13 +212,10 @@
       <element 
name="{http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/}subject";
 
                mapping="org.perfsonar.base2.xml.TextElement"/>
      
-               
                 
     </protocolMappings>
 
-    <!-- 
....................................................................................
 -->
 
-
   </service>