perfsonar development work

Author: roman
Date: 2008-04-24 05:02:48 -0400 (Thu, 24 Apr 2008)
New Revision: 3785

Modified:
   trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
   trunk/geant2-java-sql-ma/ant/const.properties.template
   trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
   trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml
Log:

use of new web admin library (0.8.4b)



Modified: trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-04-23 
19:52:25 UTC (rev 3784)
+++ trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml        2008-04-24 
09:02:48 UTC (rev 3785)
@@ -46,8 +46,8 @@
           depends="copy-dep-base-service-jars">
 
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.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/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.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.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
              todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.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.20080422/perfsonar-base-1.0.20080422.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/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.0rc2/perfsonar-rrd-ma-3.0rc2.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"/>
 

Modified: trunk/geant2-java-sql-ma/ant/const.properties.template
===================================================================
--- trunk/geant2-java-sql-ma/ant/const.properties.template      2008-04-23 
19:52:25 UTC (rev 3784)
+++ trunk/geant2-java-sql-ma/ant/const.properties.template      2008-04-24 
09:02:48 UTC (rev 3785)
@@ -11,7 +11,7 @@
 service.name=geant2-java-sql-ma
 
 jarfilename=perfsonar-sql-ma
-version=2.0rc9
+version=2.0rc10
 
 exist.war.file=exist-1.1.1-newcore.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.1.1

Modified: trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-04-23 
19:52:25 UTC (rev 3784)
+++ trunk/geant2-java-sql-ma/ant/libs-download-targets.xml      2008-04-24 
09:02:48 UTC (rev 3785)
@@ -55,7 +55,7 @@
     <artifact:dependencies>
 
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080422"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8.3b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8.4b"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.0rc2"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
 

Modified: trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml     2008-04-23 
19:52:25 UTC (rev 3784)
+++ trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml     2008-04-24 
09:02:48 UTC (rev 3785)
@@ -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.20080422/perfsonar-base-1.0.20080422.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/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.0rc2/perfsonar-rrd-ma-3.0rc2.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>