[Swift-commit] r7969 - trunk/src/org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-04 02:36:40 -0500 (Fri, 04 Jul 2014)
New Revision: 7969

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java
Log:
global apps consistent with site app format

Modified: trunk/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java	2014-07-04 07:36:11 UTC (rev 7968)
+++ trunk/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java	2014-07-04 07:36:40 UTC (rev 7969)
@@ -99,9 +99,16 @@
                         throw new ExecutionException(this, "Invalid site entry '" + poolName(n) + "': ", e);
                     }
                 }
-                else if (ctype.equals("application")) {
-                    cs.addApplication(application(n));
+                else if (ctype.equals("apps")) {
+                    SwiftContact dummy = new SwiftContact();
+                    apps(dummy, n);
+                    for (Application app : dummy.getApplications()) {
+                        cs.addApplication(app);
+                    }
                 }
+                else {
+                    throw new IllegalArgumentException("Invalid node: " + ctype);
+                }
             }
         }
         return cs;