perfsonar development work

Author: mac
Date: 2006-09-12 08:00:58 -0400 (Tue, 12 Sep 2006)
New Revision: 1631

Modified:
   trunk/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml
   trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml
Log:
Undeploying LS caused removing libraries from downloaded jar repository not 
from tomcat lib directory. Few minor changes as well.



Modified: trunk/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml     2006-09-12 
05:35:31 UTC (rev 1630)
+++ trunk/perfsonar/ant/xmlls/xmlls-axis-deploy-targets.xml     2006-09-12 
12:00:58 UTC (rev 1631)
@@ -52,18 +52,18 @@
 
     <target name="delete-jars-for-xmlls">
 
-        <delete file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
-        <delete 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
-        <delete 
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"/>
-        <delete 
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.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="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"/>
-        <delete 
file="./lib/repository/exist/exist-db/1.0rc/exist-db-1.0rc.jar"/>
-        <delete 
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"/>
-        <delete 
file="./lib/repository/exist/exist-xmlrpc/1.0rc/exist-xmlrpc-1.0rc.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/exist-db-1.0rc.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/exist-xmldb-1.0rc.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/exist-xmlrpc-1.0rc.jar"/>
 
-        <delete 
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
-        <delete 
file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/activation-1.0.2.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/mail-1.3.2.jar"/>
 
     </target>
 
@@ -143,9 +143,9 @@
 
         <antcall target="delete-jars-for-xmlls"/>
 
-        <delete 
file="${axis.home}/WEB-INF/lib/repository/perfSONAR-generic.jar"/>
-        <delete 
file="${axis.home}/WEB-INF/lib/repository/perfSONAR-xmlls.jar"/>
-        <delete file="${axis.home}/WEB-INF/lib/repository/perfSONAR.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/perfSONAR-xmlls.jar"/>
+        <delete file="${axis.home}/WEB-INF/lib/perfSONAR.jar"/>
 
     </target>
 

Modified: trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml        2006-09-12 
05:35:31 UTC (rev 1630)
+++ trunk/perfsonar/ant/xmlls/xmlls-test-run-targets.xml        2006-09-12 
12:00:58 UTC (rev 1631)
@@ -20,8 +20,17 @@
     <!-- property name="ls.test.server" 
value="http://localhost:8080/axis/services/LookupService"/ -->
 
 
+    <target name="tester"
+            description="Run Test">
+        <java classname="org.perfsonar.service.lookupService.xmlType.Tester" 
classpathref="classpath" fork="true">
+            <jvmarg 
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
+            <jvmarg 
value="-Dservice.properties=${basedir}/conf/service.properties"/>
+        </java>
+    </target>
 
 
+
+
     <!-- === Targets that test LS functionality without Tomcat 
============================= -->
 
     <!-- TESTS -->