perfsonar development work

Author: zurawski
Date: 2006-10-31 09:36:52 -0500 (Tue, 31 Oct 2006)
New Revision: 1730

Modified:
   branches/yi-udel/perfsonar/ant/libs-download-targets.xml
   branches/yi-udel/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml
   branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml
   branches/yi-udel/perfsonar/ant/xmlls/xmlls-libs-download-targets.xml
Log:
Multi-LS configuration information.

-jason



Modified: branches/yi-udel/perfsonar/ant/libs-download-targets.xml
===================================================================
--- branches/yi-udel/perfsonar/ant/libs-download-targets.xml    2006-10-31 
14:36:22 UTC (rev 1729)
+++ branches/yi-udel/perfsonar/ant/libs-download-targets.xml    2006-10-31 
14:36:52 UTC (rev 1730)
@@ -30,7 +30,7 @@
         <artifact:localRepository id="local.repository" 
location="${basedir}/lib/repository" layout="default"/>
         <artifact:remoteRepository id="remote.repository" 
url="http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/"/>
         <artifact:remoteRepository id="remote.repository.2" 
url="http://www.ibiblio.org/maven2"/>
-
+        <artifact:remoteRepository id="remote.repository.mls" 
url="http://anonsvn.internet2.edu/svn/perfsonar/branches/yi-udel/jar-repository/"/>
     </target>
 
 

Modified: branches/yi-udel/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml
===================================================================
--- branches/yi-udel/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml  
2006-10-31 14:36:22 UTC (rev 1729)
+++ branches/yi-udel/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml  
2006-10-31 14:36:52 UTC (rev 1730)
@@ -32,19 +32,18 @@
 
     <target name="copy-jars-for-xmlls">
 
+        <copy file="./lib/repository/saxon/saxon/8.8/saxon-8.8.jar"          
  todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/saxon/saxon-dom4j/8.8/saxon-dom4j-8.8.jar"        
todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/saxon/saxon-sql/8.8/saxon-sql-8.8.jar"  
  todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/saxon/saxon-xpath/8.8/saxon-xpath-8.8.jar"        
todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/saxon/saxon-dom/8.8/saxon-dom-8.8.jar"  
  todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/saxon/saxon-jdom/8.8/saxon-jdom-8.8.jar"  
todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/saxon/saxon-xom/8.8/saxon-xom-8.8.jar"  
  todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/saxon/saxon-xqj/8.8/saxon-xqj-8.8.jar"  
  todir="${axis.home}/WEB-INF/lib"/>
 
+        <copy 
file="./lib/repository/berkeley/berkeley-db/2.2.13/berkeley-db-2.2.13.jar"    
   todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/berkeley/berkeley-dbxml/2.2.13/berkeley-dbxml-2.2.13.jar"
 todir="${axis.home}/WEB-INF/lib"/>
 
-        <copy file="./lib/repository/saxon/saxon8-dom4j.jar"            
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/repository/saxon/saxon8.jar"                 
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/repository/saxon/saxon8-sql.jar"                   
  todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/repository/saxon/saxon8-xpath.jar"            
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/repository/saxon/saxon8-dom.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/repository/saxon/saxon8-jdom.jar"             
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/repository/saxon/saxon8-xom.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/repository/saxon/saxon8-xqj.jar"             
todir="${axis.home}/WEB-INF/lib"/>
-        
-
-
         <!-- copy file="./lib/repository/xml/resolver.jar"           
todir="${axis.home}/WEB-INF/lib"/ -->
         <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"      
                  todir="${axis.home}/WEB-INF/lib"/>
         <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"          
   todir="${axis.home}/WEB-INF/lib"/>
@@ -67,15 +66,18 @@
 
     <target name="delete-jars-for-xmlls">
 
-        <delete file="${axis.home}/WEB-INF/lib/saxon8-dom4j.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/saxon8.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/saxon8-sql.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/saxon8-xpath.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/saxon8-dom.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/saxon8-jdom.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/saxon8-xom.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/saxon8-xqj.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-8.8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-dom4j-8.8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-sql-8.8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-xpath-8.8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-dom-8.8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-jdom-8.8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-xom-8.8.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/saxon-xqj-8.8.jar"/>
 
+        <delete file="${axis.home}/WEB-INF/lib/berkeley-db-2.2.13.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/berkeley-dbxml-2.2.13.jar"/>
+
         <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
         <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
         <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>

Modified: branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml
===================================================================
--- branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml    
2006-10-31 14:36:22 UTC (rev 1729)
+++ branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml    
2006-10-31 14:36:52 UTC (rev 1730)
@@ -43,8 +43,8 @@
                  value="LS"/>
         <property name="default_in.r_description" 
                  value="Test Lookup Service, perfSONAR"/>                
-        <property name="default_in.r_rating" 
-                 value="1"/>
+        <property name="default_in.r_service_rank" 
+                 value="3"/>
         <property name="default_in.ls_storage_username" 
                  value="lookupservice"/>
         <property name="default_in.ls_storage_password" 
@@ -54,6 +54,17 @@
         <property name="default_in.cleanup_ttl" 
                  value="3600" /><!-- seconds -->
                  
+        <property name="default_in.ls_local_summary" 
+                 
value="${base_path}/schema/example-instances/sonar/LS/xslt/summary.xsl" />
+       <property name="default_in.ls_global_summary" 
+                 
value="${base_path}/schema/example-instances/sonar/LS/xslt/summary2.xsl" />
+       <property name="default_in.ls_summary_interval" 
+                 value="30" /><!-- seconds -->
+       <property name="default_in.ls_local_interval" 
+                 value="60" /><!-- seconds -->
+       <property name="default_in.ls_global_interval" 
+                 value="300" /><!-- seconds -->
+                 
         <property name="default_in.axis_home" 
                  value="/usr/local/tomcat/webapps/axis"/>                
     </target>
@@ -77,6 +88,14 @@
         <replace file="${template_file_components}" 
                 token="%CLEANUP%" 
                 value="${cleanup_string}"/>
+
+        <replace file="${template_file_components}" 
+                token="%TOKEN_LOCAL%" 
+                value="${local_token_string}"/>
+
+        <replace file="${template_file_components}" 
+                token="%TOKEN_GLOBAL%" 
+                value="${global_token_string}"/>
        
     </target>
  
@@ -124,8 +143,8 @@
                 token="%R_DESCRIPTION%" 
                 value="${in.r_description}"/>
         <replace file="${template_file_service}" 
-                token="%R_RATING%" 
-                value="${in.r_rating}"/>
+                token="%R_SERVICE_RANK%" 
+                value="${in.r_service_rank}"/>
         <replace file="${template_file_service}" 
                 token="%R_LOOKUP_SERVICE%"      
                 value="${in.r_lookup_service}"/>
@@ -153,7 +172,28 @@
         <replace file="${template_file_service}" 
                 token="%CLEANUP_TTL%" 
                 value="${in.cleanup_ttl}"/>
-       
+
+        <!-- Multi-LS -->
+        <replace file="${template_file_service}" 
+                token="%LS_LOCAL_SUMMARY%" 
+                value="${in.ls_local_summary}"/>       
+
+        <replace file="${template_file_service}" 
+                token="%LS_GLOBAL_SUMMARY%" 
+                value="${in.ls_global_summary}"/>
+
+        <replace file="${template_file_service}" 
+                token="%LS_SUMMARY_INTERVAL%" 
+                value="${in.ls_summary_interval}"/>
+
+        <replace file="${template_file_service}" 
+                token="%LS_LOCAL_INTERVAL%" 
+                value="${in.ls_local_interval}"/>
+ 
+        <replace file="${template_file_service}" 
+                token="%LS_GLOBAL_INTERVAL%" 
+                value="${in.ls_global_interval}"/>
+
     </target>
  
 
@@ -255,9 +295,9 @@
               addproperty="in.r_description" 
               defaultvalue="${default_in.r_description}" />
 
-        <input message="Lookup Information of service -- service rating 
[${default_in.r_rating}]"
-              addproperty="in.r_rating" 
-              defaultvalue="${default_in.r_rating}" />
+        <input message="Lookup Information of service -- service rank 
[${default_in.r_service_rank}]"
+              addproperty="in.r_service_rank" 
+              defaultvalue="${default_in.r_service_rank}" />
               
         <input message="Lookup Service to register Lookup Information 
[http://${hostname}:8080/axis/services/LookupService] - this functionality 
will be disabled. To enable it uncomment the proper section in 
service.properties file."
               addproperty="in.r_lookup_service" 
@@ -316,6 +356,56 @@
               addproperty="in.axis_home" 
               defaultvalue="${default_in.axis_home}"/>
 
+
+
+        <!-- Multi-LS -->
+
+        <input message="LS Summary -- summary interval: how often to run the 
summarizer [${default_in.ls_summary_interval}] (seconds)"
+              addproperty="in.ls_summary_interval" 
+              defaultvalue="${default_in.ls_summary_interval}" />
+
+        <input message="LS Summary -- summary file location: the local 
summary file [${default_in.ls_local_summary}]"
+              addproperty="in.ls_local_summary" 
+              defaultvalue="${default_in.ls_local_summary}" />
+              
+        <input message="LS Summary -- summary file location: the global 
summary file [${default_in.ls_global_summary}]"
+              addproperty="in.ls_global_summary" 
+              defaultvalue="${default_in.ls_global_summary}" />
+              
+       <input message="LS Local Token -- enable local token passing?"
+              addproperty="in.local_token"
+              defaultvalue="n"
+              validargs="y,n"/>       
+              
+       <condition property="local_token_string" value="">
+            <equals arg1="y" arg2="${in.local_token}"/>
+        </condition>
+                      
+       <condition property="local_token_string" value="#">
+            <equals arg1="n" arg2="${in.local_token}"/>
+        </condition>          
+              
+        <input message="LS Local token -- token interval: how often to pass 
the local token [${default_in.ls_local_interval}] (seconds)"
+              addproperty="in.ls_local_interval" 
+              defaultvalue="${default_in.ls_local_interval}" />              
         
+
+       <input message="LS Global Token -- enable global token passing?"
+              addproperty="in.global_token"
+              defaultvalue="n"
+              validargs="y,n"/>       
+              
+       <condition property="global_token_string" value="">
+            <equals arg1="y" arg2="${in.global_token}"/>
+        </condition>
+                      
+       <condition property="global_token_string" value="#">
+            <equals arg1="n" arg2="${in.global_token}"/>
+        </condition>     
+
+        <input message="LS Global token -- token interval: how often to pass 
the global token [${default_in.ls_global_interval}] (seconds)"
+              addproperty="in.ls_global_interval" 
+              defaultvalue="${default_in.ls_global_interval}" />
+
     </target>
                                                        
 
@@ -338,7 +428,7 @@
        <echo message="LI-service name [${in.r_service_name}]" />             
 
         <echo message="LI-service type [${in.r_service_type}]" />            
 
         <echo message="LI-service description [${in.r_description}]" />
-        <echo message="LI-service rating [${in.r_rating}]" />
+        <echo message="LI-service rank [${in.r_service_rank}]" />
         <echo message="LS to register with [${in.r_lookup_service}]" />
         <echo message="XML database type [${in.ls_storage_type}]" />         
 
         <echo message="XML database collection [${in.ls_storage_uri}]" />    
         
@@ -346,11 +436,18 @@
         <echo message="XML database password [${in.ls_storage_password}]" />
         <echo message="Cleanup interval [${in.cleanup_interval}] seconds" />
         <echo message="Cleanup TTL [${in.cleanup_ttl}] seconds" />
+
+        <echo message="LS Summary Interval [${in.ls_summary_interval}] 
seconds" />
+        <echo message="LS Local Summary File [${in.ls_local_summary}]" />
+        <echo message="LS Global Summary File [${in.ls_global_summary}]" />
+        <echo message="LS Local Token Interval [${in.ls_local_interval}] 
seconds" />
+        <echo message="LS Global Token Interval [${in.ls_global_interval}] 
seconds" />
+
         <echo message="Axis home dir [${in.axis_home}]" />
 
         <echo message="" />
 
-       <echo message="WARNING: Cleanup and LS Registration will be disabled 
unless you enable them in components.properties" />
+       <echo message="WARNING: Cleanup, LS Registration, and Token Passing 
will be disabled unless you enable them in components.properties" />
 
         <echo 
message="---------------------------------------------------------------"/>
 

Modified: branches/yi-udel/perfsonar/ant/xmlls/xmlls-libs-download-targets.xml
===================================================================
--- branches/yi-udel/perfsonar/ant/xmlls/xmlls-libs-download-targets.xml      
  2006-10-31 14:36:22 UTC (rev 1729)
+++ branches/yi-udel/perfsonar/ant/xmlls/xmlls-libs-download-targets.xml      
  2006-10-31 14:36:52 UTC (rev 1730)
@@ -30,9 +30,21 @@
             <dependency groupId="exist"     artifactId="exist-db"       
version="1.0rc"/>
             <dependency groupId="exist"     artifactId="exist-xmlrpc"   
version="1.0rc"/>
             <dependency groupId="exist"     artifactId="exist-optional" 
version="1.0rc"/>
-            
+
+            <dependency groupId="saxon"     artifactId="saxon"               
  version="8.8"/>
+            <dependency groupId="saxon"     artifactId="saxon-dom4j"   
version="8.8"/>
+            <dependency groupId="saxon"     artifactId="saxon-sql"     
version="8.8"/>
+            <dependency groupId="saxon"     artifactId="saxon-xpath"   
version="8.8"/>
+            <dependency groupId="saxon"     artifactId="saxon-dom"     
version="8.8"/>
+            <dependency groupId="saxon"     artifactId="saxon-jdom"    
version="8.8"/>
+            <dependency groupId="saxon"     artifactId="saxon-xom"     
version="8.8"/>
+            <dependency groupId="saxon"     artifactId="saxon-xqj"     
version="8.8"/>
+
+            <dependency groupId="berkeley"     artifactId="berkeley-db"      
  version="2.2.13"/>
+            <dependency groupId="berkeley"     artifactId="berkeley-dbxml"   
  version="2.2.13"/>
+                       
             <localRepository refid="local.repository"/>
-            <remoteRepository refid="remote.repository"/>
+            <remoteRepository refid="remote.repository.mls"/>
 
         </artifact:dependencies>