perfsonar development work

Author: gijs
Date: 2007-03-16 12:10:09 -0400 (Fri, 16 Mar 2007)
New Revision: 2245

Modified:
   trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml
   trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml
   trunk/perfsonar/ant/flowmp/flowmp-pre-install-targets.xml
   trunk/perfsonar/conf/service.properties.flowmp
Log:


Modified: trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml   2007-03-16 
10:44:41 UTC (rev 2244)
+++ trunk/perfsonar/ant/flowmp/flowmp-axis-deploy-targets.xml   2007-03-16 
16:10:09 UTC (rev 2245)
@@ -15,6 +15,8 @@
 
         <copy file="./conf/wsdd/${wsdd.file.deploy}"                         
                                   
todir="${service.home}/${deploy.root}/wsdd"/>
         <copy file="./conf/wsdd/${wsdd.file.undeploy}"                       
                                   
todir="${service.home}/${deploy.root}/wsdd"/>
+       
+       <copy file="./conf/flowmp-database_SURFnet.xml"                       
                                            
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
     </target>
 
 

Modified: trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml     2007-03-16 
10:44:41 UTC (rev 2244)
+++ trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml     2007-03-16 
16:10:09 UTC (rev 2245)
@@ -50,6 +50,7 @@
             <entry  key="service.mp.class_name"    
value="org.perfsonar.service.measurementPoint.flowType.FlowTypeMPServiceEngine"/>
 
             <entry  key="service.r.ls_url"                          
value=""/>
+               <entry  key="service.conf_file" 
value="${service.home}/${service.name}/WEB-INF/classes/perfsonar/conf/flowmp-database_SURFnet.xml"/>
             <entry  key="component.registrator.interval"            
value="30000"/>
             <entry  key="component.registrator.scheduler_component" 
value="mp_scheduler"/>
 

Modified: trunk/perfsonar/ant/flowmp/flowmp-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/flowmp/flowmp-pre-install-targets.xml   2007-03-16 
10:44:41 UTC (rev 2244)
+++ trunk/perfsonar/ant/flowmp/flowmp-pre-install-targets.xml   2007-03-16 
16:10:09 UTC (rev 2245)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="flowmp-pre-install-targets">
-    <property name="service.name" value="perfSONAR-FLOWMP-1.1-beta" />
+    <property name="service.name" value="perfSONAR-FLOWSUBMP" />
     <property file="ant/const.properties" />
 
     <!-- the main target -->

Modified: trunk/perfsonar/conf/service.properties.flowmp
===================================================================
--- trunk/perfsonar/conf/service.properties.flowmp      2007-03-16 10:44:41 
UTC (rev 2244)
+++ trunk/perfsonar/conf/service.properties.flowmp      2007-03-16 16:10:09 
UTC (rev 2245)
@@ -12,7 +12,30 @@
 service.r.service_type=Flow MP
 service.r.service_description=Java Flow MP, perfSONAR project
 
-# Message types supported by mp service
+### port configuration
+
+# port (and up) that the zebedee client should receive data at
+service.mp.flow.inPort=11110
+
+# port (and up) that the zebedee client should use for sending
+# data (and listen for reverse connection setup from server)
+service.mp.flow.betweenPort=22220
+
+### registration in LS
+#registration lookup service URL
+service.r.ls_url=http://selena.acad.bg:8070/axis/services/LookupService
+service.ls.registration_file=
+service.conf_file=
+
+#registrator component loader
+#time in milliseconds (60000 means 60 sec)
+component.registrator.interval=30000
+component.registrator.scheduler_component=mp_scheduler
+
+# location of log4j configuration file
+service.log.log4j.config=/opt/sonar/perfsonar/conf/log4j.properties
+
+cd /# Message types supported by mp service
 
service.mp.message_types=SubscriptionRequest,UnSubscriptionRequest,SubscriptionKeepaliveRequest
 
 # which versions of netflow can we export
@@ -66,23 +89,4 @@
 service.mp.flow.nfreplay=/usr/local/bin/nfreplay
 
 
-### port configuration
 
-# port (and up) that the zebedee client should receive data at
-service.mp.flow.inPort=11110
-
-# port (and up) that the zebedee client should use for sending
-# data (and listen for reverse connection setup from server)
-service.mp.flow.betweenPort=22220
-
-### registration in LS
-#registration lookup service URL
-service.r.ls_url=http://selena.acad.bg:8070/axis/services/LookupService
-
-#registrator component loader
-#time in milliseconds (60000 means 60 sec)
-component.registrator.interval=30000
-component.registrator.scheduler_component=mp_scheduler
-
-# location of log4j configuration file
-service.log.log4j.config=/opt/sonar/perfsonar/conf/log4j.properties