perfsonar development work

Author: roman
Date: 2008-03-05 07:31:15 -0500 (Wed, 05 Mar 2008)
New Revision: 3468

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
Log:

new version of web admin and base library



Modified: trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml        2008-03-04 
15:07:29 UTC (rev 3467)
+++ trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml        2008-03-05 
12:31:15 UTC (rev 3468)
@@ -45,8 +45,8 @@
   <target name="copy-dep-service-jars"
           depends="copy-dep-base-service-jars">
 
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080226/perfsonar-base-1.0.20080226.jar"
      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080303/perfsonar-base-1.0.20080303.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-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"/>
 
@@ -322,8 +322,8 @@
 
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
 
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080226/perfsonar-base-1.0.20080226.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
            todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080303/perfsonar-base-1.0.20080303.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-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-03-04 
15:07:29 UTC (rev 3467)
+++ trunk/geant2_java-sql-ma/ant/const.properties.template      2008-03-05 
12:31:15 UTC (rev 3468)
@@ -11,7 +11,7 @@
 service.name=geant2_java-sql-ma
 
 jarfilename=perfsonar-sql-ma
-version=2.0
+version=2.0rc3
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1
@@ -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.20080204.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar
 
 api.location=doc/api
 api.title=perfSONAR

Modified: trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/libs-download-targets.xml      2008-03-04 
15:07:29 UTC (rev 3467)
+++ trunk/geant2_java-sql-ma/ant/libs-download-targets.xml      2008-03-05 
12:31:15 UTC (rev 3468)
@@ -54,8 +54,8 @@
 
     <artifact:dependencies>
 
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080226"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.6b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080303"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.7b"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.0rc2"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>