[Swift-commit] r8070 - trunk/src/org/griphyn/vdl/util

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-25 23:11:04 -0500 (Fri, 25 Jul 2014)
New Revision: 8070

Modified:
   trunk/src/org/griphyn/vdl/util/ConvertConfig.java
Log:
updated config converter to not include the dist config (since it's automatically included through the search path) and make sure to delete the default local site if the user has one defined

Modified: trunk/src/org/griphyn/vdl/util/ConvertConfig.java
===================================================================
--- trunk/src/org/griphyn/vdl/util/ConvertConfig.java	2014-07-26 04:04:52 UTC (rev 8069)
+++ trunk/src/org/griphyn/vdl/util/ConvertConfig.java	2014-07-26 04:11:04 UTC (rev 8070)
@@ -138,11 +138,15 @@
     }
 
     private void generateConfig(ContactSet sites, TransformationCatalog tc, PrintStream ps) {
-        ps.println("include \"${swift.home}/etc/swift.conf\"");
         ps.println();
         
         if (sites != null) {
             for (BoundContact bc : sites.getContacts()) {
+                // the default swift.conf contains a site called local,
+                // so make sure it's overwritten
+                if ("local".equals(bc.getName())) {
+                    ps.println("site.local: null");
+                }
                 ps.println("site." + bc.getName() + " {");
                 boolean hasFileService = false;
                 boolean hasCoasterService = false;