perfsonar development work

Author: roman
Date: 2008-07-01 07:12:35 -0400 (Tue, 01 Jul 2008)
New Revision: 4065

Modified:
   trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2-java-rrd-ma/ant/const.properties.template
   trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
Log:
new versions of nmwg and ps-base libraries



Modified: trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml        2008-06-30 
14:14:17 UTC (rev 4064)
+++ trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml        2008-07-01 
11:12:35 UTC (rev 4065)
@@ -45,8 +45,8 @@
   <target name="copy-dep-service-jars"
           depends="copy-dep-base-service-jars">
 
-    <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/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/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-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"/>
@@ -245,11 +245,11 @@
 
     <copy file="${basedir}/${build}/${jarfilename}-${version}.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/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.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-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"/>
+    <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                              todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy file="${basedir}/conf/eventType-map.xml"      
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
     <copy file="${basedir}/conf/eventType-rules.xml"    
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>

Modified: trunk/geant2-java-rrd-ma/ant/const.properties.template
===================================================================
--- trunk/geant2-java-rrd-ma/ant/const.properties.template      2008-06-30 
14:14:17 UTC (rev 4064)
+++ trunk/geant2-java-rrd-ma/ant/const.properties.template      2008-07-01 
11:12:35 UTC (rev 4065)
@@ -11,7 +11,7 @@
 service.name=geant2-java-rrd-ma
 
 jarfilename=perfsonar-rrd-ma
-version=3.0rc9
+version=3.1
 
 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-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml      2008-06-30 
14:14:17 UTC (rev 4064)
+++ trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml      2008-07-01 
11:12:35 UTC (rev 4065)
@@ -55,9 +55,9 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080422"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080630"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8.3b"/>
-      <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
+      <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20080630"/>
 
 
       <localRepository  refid="local.repository"/>