perfsonar development work

Author: gijs
Date: 2008-10-10 06:03:05 -0400 (Fri, 10 Oct 2008)
New Revision: 4601

Modified:
   trunk/ps-mdm-flowsa-ma/conf/wizard.properties
   
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaConfiguration.java
Log:
default installation of bins is in /usr/bin, not /usr/local/bin



Modified: trunk/ps-mdm-flowsa-ma/conf/wizard.properties
===================================================================
--- trunk/ps-mdm-flowsa-ma/conf/wizard.properties       2008-10-10 07:29:26 
UTC (rev 4600)
+++ trunk/ps-mdm-flowsa-ma/conf/wizard.properties       2008-10-10 10:03:05 
UTC (rev 4601)
@@ -124,9 +124,9 @@
     <Group order="1">nfdump</Group>
   </property>
   <property>
-    <entry 
key="service.ma.flowsa.nfdump.location">/usr/local/bin/nfdump</entry>
+    <entry key="service.ma.flowsa.nfdump.location">/usr/bin/nfdump</entry>
     <Comment>the location of the nfdump executable (including nfdump 
filename)</Comment>
-    <ProposedValue>/usr/local/bin/nfdump</ProposedValue>
+    <ProposedValue>/usr/bin/nfdump</ProposedValue>
     <Group order="2">nfdump</Group>
   </property>
   <property>

Modified: 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaConfiguration.java
===================================================================
--- 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaConfiguration.java
       2008-10-10 07:29:26 UTC (rev 4600)
+++ 
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaConfiguration.java
       2008-10-10 10:03:05 UTC (rev 4601)
@@ -16,8 +16,8 @@
     protected static final int                 DEFAULT_MAX_RESULTS = 1000;
     protected static final int                 DEFAULT_TIMEOUT = 10;
     protected static final int                 DEFAULT_NFCAPDINTERVAL = 5;
-    protected static final File        DEFAULT_NFDUMP_EXECUTABLE = new 
File("/usr/local/bin/nfdump");
-    protected static final File        DEFAULT_NFCAPD_EXECUTABLE = new 
File("/usr/local/bin/nfcapd");
+    protected static final File        DEFAULT_NFDUMP_EXECUTABLE = new 
File("/usr/bin/nfdump");
+    protected static final File        DEFAULT_NFCAPD_EXECUTABLE = new 
File("/usr/bin/nfcapd");
     protected static final String      DEFAULT_READERFACTORYCLASSNAME = 
"org.perfsonar.service.measurementArchive.flowsa.FlowsaMAServiceEngine";
     protected static final File        DEFAULT_SOURCEDIRECTORY = new 
File("/var/nfdump/flows/");
     protected static final boolean     DEFAULT_SHOULDSTARTNFCAPDPROCESSES = 
false;