perfsonar development work

Author: roman
Date: 2008-02-07 05:54:34 -0500 (Thu, 07 Feb 2008)
New Revision: 3329

Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
Log:

use of new vesion of the base (1.0.20080207)



Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-02-07 
10:43:08 UTC (rev 3328)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-02-07 
10:54:34 UTC (rev 3329)
@@ -46,7 +46,7 @@
           depends="copy-dep-base-service-jars">
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080131/perfsonar-base-1.0.20080131.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -238,14 +238,14 @@
     <mkdir dir="${tmpdir}"/>
 
 
-    <copy file="${basedir}/conf/service.properties.template"     
tofile="${basedir}/conf/service.properties"/>
+    <copy file="${basedir}/conf/service.properties.template-2"   
tofile="${basedir}/conf/service.properties"/>
     <copy file="${basedir}/conf/components.properties.template"  
tofile="${basedir}/conf/components.properties"/>
     <copy file="${basedir}/conf/log4j.properties.template"       
tofile="${basedir}/conf/log4j.properties"/>
 
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080131/perfsonar-base-1.0.20080131.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-02-07 
10:43:08 UTC (rev 3328)
+++ trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-02-07 
10:54:34 UTC (rev 3329)
@@ -55,7 +55,7 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080131"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080207"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.5b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>