perfsonar development work

Author: roman
Date: 2008-07-22 07:06:46 -0400 (Tue, 22 Jul 2008)
New Revision: 4267

Modified:
   trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
   trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml
   trunk/geant2-java-rrd-ma/pom.xml
Log:
use of new version of the base (1.0.20080721)



Modified: trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml        2008-07-22 
09:51:16 UTC (rev 4266)
+++ trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml        2008-07-22 
11:06:46 UTC (rev 4267)
@@ -46,7 +46,7 @@
           depends="copy-dep-base-service-jars">
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.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"/>
@@ -246,7 +246,7 @@
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                              todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.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-07-22 
09:51:16 UTC (rev 4266)
+++ trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml      2008-07-22 
11:06:46 UTC (rev 4267)
@@ -55,7 +55,7 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080630"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080721"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8.3b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20080630"/>
 

Modified: trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml     2008-07-22 
09:51:16 UTC (rev 4266)
+++ trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml     2008-07-22 
11:06:46 UTC (rev 4267)
@@ -84,7 +84,7 @@
     <!-- copy jar files -->
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"           
                                     todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080630/perfsonar-base-1.0.20080630.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.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/pom.xml
===================================================================
--- trunk/geant2-java-rrd-ma/pom.xml    2008-07-22 09:51:16 UTC (rev 4266)
+++ trunk/geant2-java-rrd-ma/pom.xml    2008-07-22 11:06:46 UTC (rev 4267)
@@ -139,7 +139,7 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-base</artifactId>
-      <version>1.0.20080630</version>
+      <version>1.0.20080721</version>
     </dependency>
     <dependency>
       <groupId>perfsonar</groupId>