perfsonar development work

Author: roman
Date: 2008-07-22 07:10:39 -0400 (Tue, 22 Jul 2008)
New Revision: 4268

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



Modified: trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-07-22 
11:06:46 UTC (rev 4267)
+++ trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-07-22 
11:10:39 UTC (rev 4268)
@@ -45,7 +45,7 @@
   <target name="copy-dep-service-jars"
           depends="copy-dep-base-service-jars">
 
-    <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.4b/perfsonar-web-admin-0.8.4b.jar"
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
                    todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -288,7 +288,7 @@
 
     <copy file="${basedir}/${build}/${jarfilename}-${version}.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.4b/perfsonar-web-admin-0.8.4b.jar"
        todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.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"/>

Modified: trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-07-22 
11:06:46 UTC (rev 4267)
+++ trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-07-22 
11:10:39 UTC (rev 4268)
@@ -54,7 +54,7 @@
 
     <artifact:dependencies>
 
-      <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.4b"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.1"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20080630"/>

Modified: trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml     2008-07-22 
11:06:46 UTC (rev 4267)
+++ trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml     2008-07-22 
11:10:39 UTC (rev 4268)
@@ -80,7 +80,7 @@
 
     <!-- copy jar files -->
     <copy file="${basedir}/${build}/${jarfilename}-${version}.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.4b/perfsonar-web-admin-0.8.4b.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.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"/>

Modified: trunk/geant2-java-sql-ma/pom.xml
===================================================================
--- trunk/geant2-java-sql-ma/pom.xml    2008-07-22 11:06:46 UTC (rev 4267)
+++ trunk/geant2-java-sql-ma/pom.xml    2008-07-22 11:10:39 UTC (rev 4268)
@@ -128,7 +128,7 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-base</artifactId>
-      <version>1.0.20080630</version>
+      <version>1.0.20080721</version>
     </dependency>
     <dependency>
       <groupId>perfsonar</groupId>