perfsonar development work

Author: roman
Date: 2008-08-21 09:16:57 -0400 (Thu, 21 Aug 2008)
New Revision: 4369

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:
webadmin jar version updated (now it's 0.9b)



Modified: trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-08-21 
11:03:15 UTC (rev 4368)
+++ trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-08-21 
13:16:57 UTC (rev 4369)
@@ -46,7 +46,7 @@
           depends="copy-dep-base-service-jars">
 
     <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-web-admin/0.9b/perfsonar-web-admin-0.9b.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"/>
 
@@ -289,7 +289,7 @@
     <copy file="${basedir}/${build}/${jarfilename}-${version}.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-web-admin/0.9b/perfsonar-web-admin-0.9b.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-08-21 
11:03:15 UTC (rev 4368)
+++ trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-08-21 
13:16:57 UTC (rev 4369)
@@ -55,7 +55,7 @@
     <artifact:dependencies>
 
       <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-web-admin"  
version="0.9b"/>
       <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-08-21 
11:03:15 UTC (rev 4368)
+++ trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml     2008-08-21 
13:16:57 UTC (rev 4369)
@@ -81,7 +81,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.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-web-admin/0.9b/perfsonar-web-admin-0.9b.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"/>
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2-java-sql-ma/pom.xml
===================================================================
--- trunk/geant2-java-sql-ma/pom.xml    2008-08-21 11:03:15 UTC (rev 4368)
+++ trunk/geant2-java-sql-ma/pom.xml    2008-08-21 13:16:57 UTC (rev 4369)
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-web-admin</artifactId>
-      <version>0.8.4b</version>
+      <version>0.9b</version>
     </dependency>
     <dependency>
       <groupId>perfsonar</groupId>