perfsonar development work

Author: roman
Date: 2008-03-31 07:23:29 -0400 (Mon, 31 Mar 2008)
New Revision: 3574

Added:
   trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080331.jar
Removed:
   trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080326.jar
Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-rrd-ma/ant/const.properties.template
   trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
   trunk/geant2_java-rrd-ma/ant/webapp-package-targets.xml
Log:
- changes required to use new version of web admin library (0.8b)
- new version of the base (1.0.20080331) is used (it is needed to use new web 
admin library)




Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-31 
10:35:10 UTC (rev 3573)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-31 
11:23:29 UTC (rev 3574)
@@ -47,7 +47,7 @@
 
     <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.20080310/perfsonar-base-1.0.20080310.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.7b/perfsonar-web-admin-0.7b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.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"/>
 
@@ -247,7 +247,7 @@
 
     <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.20080310/perfsonar-base-1.0.20080310.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.7b/perfsonar-web-admin-0.7b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.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/const.properties.template
===================================================================
--- trunk/geant2_java-rrd-ma/ant/const.properties.template      2008-03-31 
10:35:10 UTC (rev 3573)
+++ trunk/geant2_java-rrd-ma/ant/const.properties.template      2008-03-31 
11:23:29 UTC (rev 3574)
@@ -21,7 +21,7 @@
 wsdd.webservice.name=MeasurementArchiveService
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080326.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080331.jar
 
 #rrdjtool native library
 lib_name=libjrrd.so

Modified: trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-03-31 
10:35:10 UTC (rev 3573)
+++ trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-03-31 
11:23:29 UTC (rev 3574)
@@ -56,7 +56,7 @@
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080310"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.7b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
 
 

Modified: trunk/geant2_java-rrd-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/webapp-package-targets.xml     2008-03-31 
10:35:10 UTC (rev 3573)
+++ trunk/geant2_java-rrd-ma/ant/webapp-package-targets.xml     2008-03-31 
11:23:29 UTC (rev 3574)
@@ -85,7 +85,7 @@
     <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.20080310/perfsonar-base-1.0.20080310.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.7b/perfsonar-web-admin-0.7b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
 
     <!-- copy conf files -->

Deleted: trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080326.jar

Added: trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080331.jar


Property changes on: 
trunk/geant2_java-rrd-ma/lib/misc/perfsonar-base-ant-1.0.20080331.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream