perfsonar development work

Author: mac
Date: 2008-01-11 08:57:08 -0500 (Fri, 11 Jan 2008)
New Revision: 3211

Modified:
   trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
   trunk/geant2_java-xml-ls/ant/libs-download-targets.xml
Log:
ant scripts updated for WebAdmin - should be moved to antlib.xml!!!

Modified: trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml        2008-01-11 
11:03:13 UTC (rev 3210)
+++ trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml        2008-01-11 
13:57:08 UTC (rev 3211)
@@ -30,7 +30,27 @@
           xmlns:psbase="psbase:/base.perfsonar.org">
 
     <psbase:copy-axis-config 
dest-conf-path="${service.home}/${deploy.root}"/>
+    
+    <!-- temporary until pS web admin is in ps base -->
+    
+    <copy file="${basedir}/conf/servlet.properties"
+          
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+    <copy file="${basedir}/conf/wizard.properties"
+          
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+    
+    <copy file="${basedir}/conf/axis-1.4/default.css"
+          todir="${service.home}/${deploy.root}"/>
+    <copy file="${basedir}/conf/axis-1.4/main.css"
+          todir="${service.home}/${deploy.root}"/>
+    <copy file="${basedir}/conf/axis-1.4/partners.gif"
+          todir="${service.home}/${deploy.root}"/>
+    <copy file="${basedir}/conf/axis-1.4/perfsonar.png"
+          todir="${service.home}/${deploy.root}"/>
+    
+    
 
+
+
   </target>
 
 
@@ -39,6 +59,18 @@
           xmlns:psbase="psbase:/base.perfsonar.org">
 
     <psbase:copy-dep-base-service-jars 
dest-jars-path="${service.home}/${deploy.root}"/>
+    
+    <!-- temporary until pS web admin is in ps base -->
+    
+    <copy 
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
 
+          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
 
+          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/commons-io/commons-io/1.2/commons-io-1.2.jar" 
+          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
 
+          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    
   </target>
 
 

Modified: trunk/geant2_java-xml-ls/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/libs-download-targets.xml      2008-01-11 
11:03:13 UTC (rev 3210)
+++ trunk/geant2_java-xml-ls/ant/libs-download-targets.xml      2008-01-11 
13:57:08 UTC (rev 3211)
@@ -57,7 +57,16 @@
       <!-- dependency groupId="rrdjtool"  artifactId="rrdjtool"       
version="1.0"/ -->
       <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="${ps-jar-ver}"/>
       <dependency groupId="nmwg"      artifactId="nmwg"           
version="${nmwg-jar-ver}"/>
-
+      
+      <!-- temporary until WebAdmin is in psBase dependency -->
+           
+      <dependency groupId="commons-codec"  artifactId="commons-codec"  
version="1.3"/>
+      <dependency groupId="commons-fileupload"  
artifactId="commons-fileupload"  version="1.2"/>
+      <dependency groupId="commons-io"  artifactId="commons-io"  
version="1.2"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.5b"/>
+      
+      <!-- /dependency -->
+      
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>