perfsonar development work

Author: rodriguez
Date: 2006-11-22 04:55:48 -0500 (Wed, 22 Nov 2006)
New Revision: 1771

Modified:
   branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml
   branches/ulisseskan/ant/tops/tops-test-run-targets.xml
Log:
Update the ant information

Modified: branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml
===================================================================
--- branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml   2006-11-21 
17:53:57 UTC (rev 1770)
+++ branches/ulisseskan/ant/tops/tops-axis-deploy-targets.xml   2006-11-22 
09:55:48 UTC (rev 1771)
@@ -3,9 +3,9 @@
 <!-- ===================================================================
 <description>
 
-   $Id: xmlls-axis-deploy-targets.xml,v 1.2 2006/04/07 10:19:12 mac Exp $
+   $Id: tops-axis-deploy-targets.xml,v 1.2 2006/11/22 10:19:12 kan Exp $
    project: perfSONAR
-   author: mac
+   author: kan
 
 Notes:
    A set of targets for deployment of web service in the Axis.
@@ -23,94 +23,47 @@
 
     <!-- general -->
 
-
     <property name="adminService" 
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
-    <!-- <property name="deployFile" 
value="../${build}/${wsdd.path}/tops-service-deploy.wsdd" /> -->
-    <!-- <property name="undeployFile" 
value="../${build}/${wsdd.path}/tops-service-undeploy.wsdd" /> -->
 
     <target name="copy-jars-for-tops" depends="jar-tops">
-
         <!-- this should be generic-libs' jar files -->
-        <copy file="./lib/xml/jdom.jar"               
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/resolver.jar"           
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xalan.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xercesImpl.jar"         
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xercesSamples.jar"      
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xml-apis.jar"           
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmlParserAPIs.jar"      
todir="${axis.home}/WEB-INF/lib"/>
-
-        <copy file="./lib/xml/commons-pool-1.1.jar"   
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmldb.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/xml/xmlrpc-1.2-patched.jar" 
todir="${axis.home}/WEB-INF/lib"/>
-
-        <copy file="./lib//misc/activation.jar"       
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/misc/mail.jar"              
todir="${axis.home}/WEB-INF/lib"/>
-        <copy file="./lib/misc/xmlsec.jar"            
todir="${axis.home}/WEB-INF/lib"/>
-
-       <!-- files needed to download from jars-for-tops target -->
-
+        <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"         
            todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/extra/xml-commons/resolver.jar"                    
            todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"      
            todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"       
todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"       
todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar" 
todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar" 
todir="${axis.home}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
 todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"   
                todir="${axis.home}/WEB-INF/lib"/>
+        <copy file="./lib/extra/xml-security/xmlsec-1.3.0.jar"               
                todir="${axis.home}/WEB-INF/lib"/>
+               <copy 
file="./lib/extra/servlet-api/5.0.28/servlet-api-5.0.28.jar"                  
 todir="${axis.home}/WEB-INF/lib"/>
+               <!-- files needed to download from jars-for-tops target -->
         <copy 
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
          todir="${axis.home}/WEB-INF/lib"/>
-
     </target>
 
 
     <target name="delete-jars-for-tops">
-
-        <delete file="${axis.home}/WEB-INF/lib/jdom.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/jdom-1.0b8.jar"/>
         <delete file="${axis.home}/WEB-INF/lib/resolver.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xalan.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xercesImpl.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xercesSamples.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xml-apis.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs.jar"/>
-
+        <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
         <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xmldb.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/activation-1.0.2.jar"/>
         <delete file="${axis.home}/WEB-INF/lib/xmlrpc-1.2-patched.jar"/>
-
         <delete file="${axis.home}/WEB-INF/lib/activation.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/mail.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/xmlsec.jar"/>
-
+        <delete file="${axis.home}/WEB-INF/lib/mail-1.3.2.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/xmlsec-1.3.0.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/servlet-api-5.0.28.jar"/>
        <!-- files needed to download from jars-for-tops target -->
-
         <delete 
file="${axis.home}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
-
     </target>
 
-
-
-    <!-- generic -->
-
-    <available file="${build}/perfSONAR-generic.jar" 
property="jar.perfsonar.generic.present"/>
-
-
-    <target name="does-jar-generic-exist" 
unless="jar.perfsonar.generic.present">
-        <echo>------------------------------ WARNING 
---------------------------</echo>
-        <echo/>
-        <echo>You don't have perfSONAR-generic.jar file in ${build} 
directory!!!</echo>
-        <echo/>
-        
<echo>------------------------------------------------------------------</echo>
-    </target>
-
-
-    <target name="copy-generic-jar"
-            depends="copy-jars-for-tops,
-                    does-jar-generic-exist"
-            if="jar.perfsonar.generic.present"
-            description="Copy generic jar to Tomcat">
-
-        <copy file="${build}/perfSONAR-generic.jar" 
todir="${axis.home}/WEB-INF/lib"/>
-
-    </target>
-
-
-
     <!-- Topology Service -->
 
     <available file="${build}/perfSONAR-tops.jar"   
property="jar.perfsonar.tops.present"/>
-
-
     <target name="does-jar-tops-exist" unless="jar.perfsonar.tops.present">
         <echo>------------------------------ WARNING 
---------------------------</echo>
         <echo/>
@@ -121,7 +74,9 @@
 
 
     <target name="copy-tops-jar" 
-                description="Copy tops jar of Tomcat">
+                       depends="copy-generic-jar, copy-jars-for-tops, 
does-jar-tops-exist"
+            if="jar.perfsonar.tops.present"
+            description="Copy tops jar of Tomcat">
 
         <copy file="${build}/perfSONAR-tops.jar" 
todir="${axis.home}/WEB-INF/lib"/>
 
@@ -152,11 +107,8 @@
             <classpath refid="classpath"/>
         </java>
 
-        <!--- antcall target="delete-jars-for-tops"/ -->
-
-        <!-- delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar" / 
-->
+        <antcall target="delete-jars-for-tops"/>
         <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tops.jar"/>
-        <!-- delete file="${axis.home}/WEB-INF/lib/perfSONAR.jar"/ -->
 
     </target>
 

Modified: branches/ulisseskan/ant/tops/tops-test-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/tops/tops-test-run-targets.xml      2006-11-21 
17:53:57 UTC (rev 1770)
+++ branches/ulisseskan/ant/tops/tops-test-run-targets.xml      2006-11-22 
09:55:48 UTC (rev 1771)
@@ -1,5 +1,4 @@
-
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ===================================================================
 <description>
 
@@ -13,15 +12,10 @@
 </description>
 ==================================================================== -->
 
-
 <project name="tops-test-run-targets">
-
-
     <!-- === Targets that test TOPS functionality without Tomcat 
============================= -->
-
     <!-- TESTS -->
 
-
     <target name="tops-test-query"
             description="Run TOPS pseudo Test">
         <java classname="org.perfsonar.client.testHarness.LSTestClient" 
classpathref="classpath" fork="true">
@@ -29,7 +23,7 @@
             <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
             <arg value="query"/>
             <arg value="RequestHandler"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/TOPS/test/TOPSDownloadDBRequest.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/TOPS/test/TOPSDownloadRequest.xml"/>
         </java>
     </target>