perfsonar development work

Author: fernandes
Date: 2006-12-18 11:22:16 -0500 (Mon, 18 Dec 2006)
New Revision: 1850

Added:
   trunk/perfsonar/conf/components.properties.clmpr
Modified:
   trunk/perfsonar/ant/clmp/clmp-configure-targets.xml
   trunk/perfsonar/ant/clmp/clmp-release-targets.xml
   trunk/perfsonar/conf/components.properties.clmp
Log:
The only way I found to fix ant reordering of component.properties was using 
two files, one with register functionality and the other without.

Modified: trunk/perfsonar/ant/clmp/clmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/clmp-configure-targets.xml 2006-12-18 15:45:28 
UTC (rev 1849)
+++ trunk/perfsonar/ant/clmp/clmp-configure-targets.xml 2006-12-18 16:22:16 
UTC (rev 1850)
@@ -87,18 +87,55 @@
     <!-- creating components.properties file -->
 
 
-    <target name="copy-components-properties">
+    <target name="copy-components-properties" 
unless="functionality.register.decision">
 
         <copy file="conf/components.properties.clmp" 
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
 
     </target>
 
+    <target name="resource-protection-for-clmp">
 
+        <echo>The CL-MP implements simple resource protection limiting</echo>
+        <echo>the number of concurrent processes of a specific tool.</echo>
+        <echo>This only applies to a particular tool, being the tools</echo>
+        <echo>independent of each other. If you want to disable a 
tool,</echo>
+        <echo>define a number less than one for it's configuration. If</echo>
+        <echo>you don't want any limits, hit enter to accept the 
default.</echo>
+        <echo></echo>
+        <echo></echo>
+           <echo>How many concurrent ping measurements do you want?</echo>
+        <input message="[enter for no limit]:"
+            addproperty="ping" defaultvalue="99999" />
+    
+           <echo>How many concurrent traceroute measurements do you 
want?</echo>
+        <input message="[enter for no limit]:"
+            addproperty="traceroute" defaultvalue="99999" />
+    
+           <echo>How many concurrent OWAMP measurements do you want?</echo>
+        <input message="[enter for no limit]:"
+            addproperty="owamp" defaultvalue="99999" />
+    
+           <echo>How many concurrent BWCTL measurements do you want?</echo>
+        <input message="[enter for no limit]:"
+            addproperty="bwctl" defaultvalue="99999" />
+    
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+
+            <entry  key="service.mp.clmp.rp.maxthreads.ping" 
value="${ping}"/>
+            <entry  key="service.mp.clmp.rp.maxthreads.traceroute" 
value="${traceroute}"/>
+            <entry  key="service.mp.clmp.rp.maxthreads.owamp" 
value="${owamp}"/>
+            <entry  key="service.mp.clmp.rp.maxthreads.bwctl" 
value="${bwctl}"/>
+
+        </propertyfile>
+
+    </target>
+
     <!-- configuring LS register functionality -->
 
 
     <target name="register-fuctionality-for-clmp"
-        depends="register-fuctionality"
+        depends="register-fuctionality,copy-components-properties"
         if="functionality.register.decision">
 
         <propertyfile file="conf/service.properties" 
@@ -109,14 +146,18 @@
             <entry  key="component.registrator.scheduler_component" 
value="scheduler"/>
 
         </propertyfile>
-
-        <propertyfile file="conf/components.properties" 
+ 
+        <copy file="conf/components.properties.clmpr" 
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+       <!--propertyfile file="conf/components.properties" 
             comment="This file was created by the Ant configuration script.">
 
+            <entry  key="logger" 
value="org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent"/>
+            <entry  key="config" 
value="org.perfsonar.commons.auxiliary.components.configuration.properties.PropertiesConfigurationComponent"/>
             <entry  key="scheduler" 
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
             <entry  key="registrator" 
value="org.perfsonar.service.commons.registration.LSRegistrationComponent"/>
+            <entry  key="clmprp" 
value="org.perfsonar.service.measurementPoint.commandLine.CommandLineResourceProtector"/>
 
-        </propertyfile>
+        </propertyfile-->
 
     </target>
 
@@ -128,9 +169,9 @@
 
         <echo>Configuring...</echo>
 
-        <antcall target="copy-components-properties"/>
         <antcall target="set-const-properties-for-clmp"/>
         <antcall target="set-service-properties-for-clmp"/>
+        <antcall target="resource-protection-for-clmp"/>
         <antcall target="set-log4j-properties"/>
         <antcall target="register-fuctionality-for-clmp"/>
 

Modified: trunk/perfsonar/ant/clmp/clmp-release-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/clmp-release-targets.xml   2006-12-18 15:45:28 
UTC (rev 1849)
+++ trunk/perfsonar/ant/clmp/clmp-release-targets.xml   2006-12-18 16:22:16 
UTC (rev 1850)
@@ -59,6 +59,7 @@
        <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
        <delete dir="tmp/${service.name}/perfsonar/ant/sqlma"/>
        <delete dir="tmp/${service.name}/perfsonar/ant/tcmp"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/flowmp"/>
        <delete dir="tmp/${service.name}/perfsonar/ant/tops"/>
        <delete dir="tmp/${service.name}/perfsonar/ant/xmlls"/>
 
@@ -74,6 +75,7 @@
 
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.ma"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.mp"/>
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.flowmp"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.sqlma"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tops"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tcmp"/>
@@ -81,6 +83,7 @@
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.rrdma"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.mp"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.sqlma"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.flowmp"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.tops"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.tcmp"/>
 

Modified: trunk/perfsonar/conf/components.properties.clmp
===================================================================
--- trunk/perfsonar/conf/components.properties.clmp     2006-12-18 15:45:28 
UTC (rev 1849)
+++ trunk/perfsonar/conf/components.properties.clmp     2006-12-18 16:22:16 
UTC (rev 1850)
@@ -1,7 +1,4 @@
-# File contains components to load
-# Config and logger MUST be load as first!
 
-
 #Configuration component - must be the first one!
 
config=org.perfsonar.commons.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
 
@@ -9,5 +6,8 @@
 
logger=org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
 #Service specific components
-#...
 
+#Resource Protector - must be loaded!
+clmprp=org.perfsonar.service.measurementPoint.commandLine.CommandLineResourceProtector
+
+

Added: trunk/perfsonar/conf/components.properties.clmpr