perfsonar development work

Author: gijs
Date: 2007-03-12 13:16:03 -0400 (Mon, 12 Mar 2007)
New Revision: 2217

Removed:
   trunk/perfsonar/ant/flowmp/flowTypeMP-axis-deploy-targets.xml
   trunk/perfsonar/ant/flowmp/flowTypeMP-configure-targets.xml
   trunk/perfsonar/ant/flowmp/flowTypeMP-doc-targets.xml
   trunk/perfsonar/ant/flowmp/flowTypeMP-java-compile-targets.xml
   trunk/perfsonar/ant/flowmp/flowTypeMP-release-targets.xml
   trunk/perfsonar/ant/flowmp/flowTypeMP-test-targets.xml
Modified:
   trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml
   trunk/perfsonar/ant/flowmp/flowmp-java-compile-targets.xml
   trunk/perfsonar/conf/components.properties.flowmp
   trunk/perfsonar/conf/service.properties.flowmp
Log:


Deleted: trunk/perfsonar/ant/flowmp/flowTypeMP-axis-deploy-targets.xml

Deleted: trunk/perfsonar/ant/flowmp/flowTypeMP-configure-targets.xml

Deleted: trunk/perfsonar/ant/flowmp/flowTypeMP-doc-targets.xml

Deleted: trunk/perfsonar/ant/flowmp/flowTypeMP-java-compile-targets.xml

Deleted: trunk/perfsonar/ant/flowmp/flowTypeMP-release-targets.xml

Deleted: trunk/perfsonar/ant/flowmp/flowTypeMP-test-targets.xml

Modified: trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml     2007-03-12 
15:54:50 UTC (rev 2216)
+++ trunk/perfsonar/ant/flowmp/flowmp-configure-targets.xml     2007-03-12 
17:16:03 UTC (rev 2217)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="rrdma-configure-targets">
+<project name="flowmp-configure-targets">
 
     <property file="ant/const.properties" />
     <property name="deploy.root" value="${service.name}" />
@@ -51,7 +51,7 @@
 
             <entry  key="service.r.ls_url"                          
value=""/>
             <entry  key="component.registrator.interval"            
value="30000"/>
-            <entry  key="component.registrator.scheduler_component" 
value="ma_scheduler"/>
+            <entry  key="component.registrator.scheduler_component" 
value="mp_scheduler"/>
 
         </propertyfile>
 
@@ -71,15 +71,21 @@
             comment="This file was created by the Ant configuration script.">
             <entry  key="service.r.service_name" value="${service.name}"/>
             <entry  key="service.r.service_type" value="MP"/>
-            <entry  key="component.registrator.scheduler_component" 
value="ma_scheduler"/>
+            <entry  key="component.registrator.scheduler_component" 
value="mp_scheduler"/>
         </propertyfile>
                
         <propertyfile file="conf/components.properties" 
             comment="This file was created by the Ant configuration script.">
-            <entry  key="ma_scheduler" 
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
-            <entry  key="registrator" 
value="org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+            <entry  key="mp_scheduler" 
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
+            <entry  key="registrator" 
value="org.perfsonar.service.measurementPoint.register.LSRegistrationComponent"/>
         </propertyfile>
+        <replace file="conf/components.properties"
+            
token="#mp_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+            
value="mp_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
 
+        <replace file="conf/components.properties"
+            
token="#registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent"
+            
value="registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent"/>
     </target>
 
 

Modified: trunk/perfsonar/ant/flowmp/flowmp-java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/flowmp/flowmp-java-compile-targets.xml  2007-03-12 
15:54:50 UTC (rev 2216)
+++ trunk/perfsonar/ant/flowmp/flowmp-java-compile-targets.xml  2007-03-12 
17:16:03 UTC (rev 2217)
@@ -23,16 +23,10 @@
 
     <target name="compile-flowmp"
                 description="Compiles Java files of FLOW MP">
-        <javac srcdir="src" destdir="${build}" deprecation="yes">
+        <javac srcdir="src" destdir="${build}" deprecation="yes" 
debug="true">
             <include 
name="org/perfsonar/service/measurementPoint/flowType/**" />
+               <include 
name="org/perfsonar/service/measurementPoint/register/**" />
             <include name="org/perfsonar/service/web/**" />
-                       <include 
name="org/perfsonar/service/measurementArchive/register/**" />
-                       <include name="org/perfsonar/service/commons/**" />
-                       <!--
-            <include 
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java"
 />
-            <include 
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java"
 />
-            <include 
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.java" />
-                       -->
             <classpath refid="classpath"/>
         </javac>
 
@@ -49,14 +43,11 @@
                 description="Creates JAR file for FLOW MP">
         <jar destfile="${build}/perfSONAR-flowmp.jar">
             <fileset dir="${build}">
-                <include 
name="org/perfsonar/service/measurementPoint/flowType/**" />
-                <include name="org/perfsonar/service/web/**" />
-                               <!--
-                <include 
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.class"
 />
-                <include 
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.class"
 />
-                <include 
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.class" />
-                               -->
+                               <include name="**" />
             </fileset>
+            <fileset dir="src">
+               <include name="**/*.java" />
+            </fileset>
         </jar>
     </target>
 

Modified: trunk/perfsonar/conf/components.properties.flowmp
===================================================================
--- trunk/perfsonar/conf/components.properties.flowmp   2007-03-12 15:54:50 
UTC (rev 2216)
+++ trunk/perfsonar/conf/components.properties.flowmp   2007-03-12 17:16:03 
UTC (rev 2217)
@@ -9,11 +9,13 @@
 
logger=org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 # Simple scheduler
-scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
+#mp_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
 
 # Registration in LS
-registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent
+#registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent
 
 #Service specific components
+
 #...
 
+

Modified: trunk/perfsonar/conf/service.properties.flowmp
===================================================================
--- trunk/perfsonar/conf/service.properties.flowmp      2007-03-12 15:54:50 
UTC (rev 2216)
+++ trunk/perfsonar/conf/service.properties.flowmp      2007-03-12 17:16:03 
UTC (rev 2217)
@@ -25,7 +25,7 @@
 service.mp.flow.sample_rate = 100
 
 # in what directory does FlowFork life
-service.mp.flow.base_dir=/usr/local/gijs/flowfork
+service.mp.flow.base_dir=/home/gijs/flowfork
 
 # where are the client xml files with connection data
 service.mp.flow.client_dir=/home/lingo/clients/
@@ -75,3 +75,14 @@
 # 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