[Swift-commit] r8012 - in trunk/src/org: globus/swift/data griphyn/vdl/karajan griphyn/vdl/util

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-12 17:25:29 -0500 (Sat, 12 Jul 2014)
New Revision: 8012

Modified:
   trunk/src/org/globus/swift/data/Director.java
   trunk/src/org/griphyn/vdl/karajan/Loader.java
   trunk/src/org/griphyn/vdl/util/SwiftConfig.java
Log:
fixed cmd file property

Modified: trunk/src/org/globus/swift/data/Director.java
===================================================================
--- trunk/src/org/globus/swift/data/Director.java	2014-07-12 20:36:22 UTC (rev 8011)
+++ trunk/src/org/globus/swift/data/Director.java	2014-07-12 22:25:29 UTC (rev 8012)
@@ -115,7 +115,7 @@
     static void init(SwiftConfig config) throws IOException
     {        
         broadcastMode = config.getCDMBroadcastMode();
-        logfile = config.getCDMLogFile();
+        logfile = config.getCDMFile();
         
         if (broadcastMode.equals("file")) 
             broadcasted.put("LOCAL_FILE", new HashSet<String>());

Modified: trunk/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/Loader.java	2014-07-12 20:36:22 UTC (rev 8011)
+++ trunk/src/org/griphyn/vdl/karajan/Loader.java	2014-07-12 22:25:29 UTC (rev 8012)
@@ -110,6 +110,7 @@
         CMD_LINE_OPTIONS.add("mappingCheckerEnabled");
         CMD_LINE_OPTIONS.add("tracingEnabled");
         CMD_LINE_OPTIONS.add("maxForeachThreads");
+        CMD_LINE_OPTIONS.add("CDMFile");
     }
 
     public static String buildVersion;

Modified: trunk/src/org/griphyn/vdl/util/SwiftConfig.java
===================================================================
--- trunk/src/org/griphyn/vdl/util/SwiftConfig.java	2014-07-12 20:36:22 UTC (rev 8011)
+++ trunk/src/org/griphyn/vdl/util/SwiftConfig.java	2014-07-12 22:25:29 UTC (rev 8012)
@@ -69,7 +69,7 @@
         REPLICATION_LIMIT("replicationLimit"), 
         WRAPPER_INVOCATION_MODE("wrapperInvocationMode"), 
         CDM_BROADCAST_MODE("CDMBroadcastMode"), 
-        CMD_LOG_FILE("CDMLogFile");
+        CMD_FILE("CDMFile");
         
         public String propName;
         private Key(String propName) {
@@ -783,7 +783,7 @@
         return (String) get(Key.CDM_BROADCAST_MODE);
     }
 
-    public String getCDMLogFile() {
-        return (String) get(Key.CMD_LOG_FILE);
+    public String getCDMFile() {
+        return (String) get(Key.CMD_FILE);
     }
 }