perfsonar development work

Author: michael.bischoff
Date: 2008-10-07 05:44:08 -0400 (Tue, 07 Oct 2008)
New Revision: 4594

Modified:
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
Log:
Do not use 1.6 while we target 1.5

Modified: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
===================================================================
--- 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
 2008-10-07 07:29:34 UTC (rev 4593)
+++ 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
 2008-10-07 09:44:08 UTC (rev 4594)
@@ -348,8 +348,8 @@
        }
        
        private void checkCanExecute(String path, String name) throws 
PerfSONARException {
-               if(!new File(path).canExecute()) {
-                       throw new 
PerfSONARException("error.ma.configuration",name+" executable doesn't exist 
or the program is not allow to execute it.");
+               if(!new File(path).exists()) {
+                       throw new 
PerfSONARException("error.ma.configuration",name+" executable doesn't 
exist.");
                }
        }
 

Modified: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
===================================================================
--- 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
   2008-10-07 07:29:34 UTC (rev 4593)
+++ 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/ZebedeeControl.java
   2008-10-07 09:44:08 UTC (rev 4594)
@@ -46,8 +46,8 @@
                        
                        zebedeeExecutable = 
configuration.getProperty("service.mp.flow.zebedee");
 
-                       if(!new File(zebedeeExecutable).canExecute()) {
-                               throw new 
PerfSONARException("error.ma.configuration","Zebedee executable doesn't exist 
or the program is not allow to execute it.");
+                       if(!new File(zebedeeExecutable).exists()) {
+                               throw new 
PerfSONARException("error.ma.configuration","Zebedee executable doesn't 
exist");
                        }
                } catch (Exception e) {
                        //fail fast with a runtime exception