perfsonar development work

Author: joost
Date: 2007-01-04 16:05:52 -0500 (Thu, 04 Jan 2007)
New Revision: 1879

Modified:
   trunk/perfsonar/ant/build-flowmp.xml
   trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml
   trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml
Log:
still some ant issues

Modified: trunk/perfsonar/ant/build-flowmp.xml
===================================================================
--- trunk/perfsonar/ant/build-flowmp.xml        2007-01-04 18:33:06 UTC (rev 
1878)
+++ trunk/perfsonar/ant/build-flowmp.xml        2007-01-04 21:05:52 UTC (rev 
1879)
@@ -3,7 +3,7 @@
     <property file="ant/const.properties" />
 
     <path id="classpath">
-        <fileset dir="../../">
+        <fileset dir="../">
             <include name="**/*.jar"/>
         </fileset>
         <pathelement location="build"/>

Modified: trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml   2007-01-04 
18:33:06 UTC (rev 1878)
+++ trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml   2007-01-04 
21:05:52 UTC (rev 1879)
@@ -55,8 +55,9 @@
             if="jar.perfsonar.flowmp.present"
             description="Copy flowmp jar to Tomcat">
 
-        <copy file="${build}/perfSONAR-flowmp.jar" 
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
+        <copy file="${build}/perfSONAR-flowmp.jar" 
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+       <!-- create the clients directory -->
+       <mkdir 
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/clients" />
     </target>
 
 
@@ -150,6 +151,9 @@
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-flowmp.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>
+       
+       <!-- remove the clients directory -->
+       <rmdir 
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/clients/conf/clients"
 />
 
         <antcall target="tomcat-shutdown" />
 

Modified: trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml     2007-01-04 
18:33:06 UTC (rev 1878)
+++ trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml     2007-01-04 
21:05:52 UTC (rev 1879)
@@ -40,7 +40,8 @@
             <entry  key="service.log.log4j.config"  
value="${basedir}/conf/log4j.properties"/>
             <entry  key="service.sax_parser.config" 
value="${basedir}/src/objects.config"/>
 
-            <entry  key="service.mp.conf_file"     
value="${flow.config.file}"/>
+            <entry  key="service.mp.conf_file"     
value="${flow.config.file}"/>
+            <entry  key="service.mp.flow.client_dir"     
value="${service.home}/${service.name}/WEB-INF/classes/perfsonar/conf/clients"/>
             <entry  key="service.mp.message_types" 
value="SubscriptionRequest,UnSubscriptionRequest,SubscriptionKeepaliveRequest"/>
             <entry  key="service.mp.class_name"    
value="org.perfsonar.service.measurementPoint.flowType.FlowTypeMPServiceEngine"/>