perfsonar development work

Author: roman
Date: 2008-03-03 07:51:38 -0500 (Mon, 03 Mar 2008)
New Revision: 3442

Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
Log:

new version of web admin library



Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-03 
12:49:36 UTC (rev 3441)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-03 
12:51:38 UTC (rev 3442)
@@ -46,8 +46,8 @@
           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.20080228/perfsonar-base-1.0.20080228.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.20080229/perfsonar-base-1.0.20080229.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
@@ -65,6 +65,23 @@
     <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"    
todir="${service.home}/${deploy.root}/wsdd"/>
     <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"  
todir="${service.home}/${deploy.root}/wsdd"/>
 
+
+    <!-- start base stuff -->
+    <!-- todo: move to the base -->
+
+    <copy todir="${service.home}/${deploy.root}">
+      <fileset dir="${basedir}/conf/axis-1.4">
+        <exclude name="*.gif"/>
+      </fileset>
+    </copy>
+    <copy todir="${service.home}/${deploy.root}">
+      <fileset dir="${basedir}/conf/axis-1.4">
+        <exclude name="*.js"/>
+      </fileset>
+    </copy>
+
+    <!-- end base stuff -->
+
   </target>
 
 
@@ -245,8 +262,8 @@
     <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.20080228/perfsonar-base-1.0.20080228.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.20080229/perfsonar-base-1.0.20080229.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
 

Modified: trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-03-03 
12:49:36 UTC (rev 3441)
+++ trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-03-03 
12:51:38 UTC (rev 3442)
@@ -55,8 +55,8 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080228"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.6b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080229"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.7b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>