Changeset 1907 for trunk

Timestamp:

2011-06-16 15:53:57 (11 months ago)

Author:

bruno

Message:

When using <directory> in wiring.xml, not only load jar files from within the directory, but also XML files. The XML files will be parsed in the same way as wiring.xml's (except for the virtualHost section which will be ignored if present), thus offering inclusion functionality for wiring.xml files.
The same for <file>, the path can now point to an XML file.
Recursive inclusions are detected.

File:

• trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/model/KauriRuntimeModelBuilder.java (modified) (6 diffs)

trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/model/KauriRuntimeModelBuilder.java

@@ -27 +27 @@
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -57 +58 @@
         }
 
+        Stack<String> wiringFileStack = new Stack<String>(); // used to detect recursive wiring.xml inclusions
+        List<ModuleDefinition> modules = new ArrayList<ModuleDefinition>();
+
+        buildModules(modules, wiringFileStack, runtimeConf, repository, artifactSourceLocations);
+
+        // Remove disabled module entries
+        Iterator<ModuleDefinition> it = modules.iterator();
+        while (it.hasNext()) {
+            ModuleDefinition entry = it.next();
+            if (disabledModuleIds.contains(entry.getId()))
+                it.remove();
+        }
+
+        for (ModuleDefinition md : modules)
+            model.addModule(md);
+
+        return model;
+    }
+
+    private static void buildModules(List<ModuleDefinition> modules, Stack<String> wiringFileStack, Conf runtimeConf,
+            ArtifactRepository repository, SourceLocations artifactSourceLocations) throws Exception {
+
         Conf modulesConf = runtimeConf.getRequiredChild("modules");
-
-        List<ModuleDefinition> modules = new ArrayList<ModuleDefinition>();
         List<Conf> importConfs = modulesConf.getChildren();
         for (Conf importConf : importConfs) {
@@ -65 +86 @@
             ModuleSourceType sourceType = null;
             String version = "unknown";
-            String id = importConf.getAttribute("id");
+            String id = null;
             if (importConf.getName().equals("file")) {
                 String path = PropertyResolver.resolveProperties(importConf.getAttribute("path"));
-                fileToImport = new File(path);
-                sourceType = ModuleSourceType.JAR;
+                File file = new File(path);
+                if (file.getName().toLowerCase().endsWith(".xml")) {
+                    // Import a wiring.xml-type file
+                    includeWiring(file, modules, wiringFileStack, repository, artifactSourceLocations);
+                } else {
+                    id = importConf.getAttribute("id");
+                    fileToImport = new File(path);
+                    sourceType = ModuleSourceType.JAR;
+                }
             } else if (importConf.getName().equals("artifact")) {
+                id = importConf.getAttribute("id");
                 String groupId = importConf.getAttribute("groupId");
                 String artifactId = importConf.getAttribute("artifactId");
@@ -91 +120 @@
                 }
             } else if (importConf.getName().equals("directory")) {
+                id = importConf.getAttribute("id");
                 String dirName = PropertyResolver.resolveProperties(importConf.getAttribute("path"));
                 File dir = new File(dirName);
                 if (dir.exists() && dir.isDirectory()) {
-                    File[] jarFiles = dir.listFiles(new JarFilter());
+                    File[] files = dir.listFiles();
                     // order of imports is important, to provide some deterministic behaviour, sort the entries by name
-                    Arrays.sort(jarFiles, new FileNameComparator());
-                    for (File file : jarFiles) {
-                        String genId = id + "-" + stripJarExt(file.getName());
-                        modules.add(new ModuleDefinition(genId, file, ModuleSourceType.JAR));
+                    Arrays.sort(files, new FileNameComparator());
+                    for (File file : files) {
+                        if (file.isDirectory()) {
+                            // skip
+                        } else if (file.getName().toLowerCase().endsWith(".jar")) {
+                            String genId = id + "-" + stripJarExt(file.getName());
+                            modules.add(new ModuleDefinition(genId, file, ModuleSourceType.JAR));
+                        } else if (file.getName().toLowerCase().endsWith(".xml")) {
+                            // Import a wiring.xml-type file
+                            includeWiring(file, modules, wiringFileStack, repository, artifactSourceLocations);
+                        }
                     }
                 }
@@ -120 +157 @@
             }
         }
-
-        // Remove disabled module entries
-        Iterator<ModuleDefinition> it = modules.iterator();
-        while (it.hasNext()) {
-            ModuleDefinition entry = it.next();
-            if (disabledModuleIds.contains(entry.getId()))
-                it.remove();
-        }
-
-        for (ModuleDefinition md : modules)
-            model.addModule(md);
-
-        return model;
+    }
+
+    private static void includeWiring(File file, List<ModuleDefinition> modules, Stack<String> wiringFileStack,
+            ArtifactRepository repository, SourceLocations artifactSourceLocations) throws Exception {
+
+        String key = file.getCanonicalPath();
+
+        if (wiringFileStack.contains(key)) {
+            throw new KauriRTException("Recursive loading of wiring.xml-type file detected: " + key);
+        }
+
+        Conf conf = XmlConfBuilder.build(file);
+
+        // go recursive
+        wiringFileStack.push(key);
+        buildModules(modules, wiringFileStack, conf, repository, artifactSourceLocations);
+        wiringFileStack.pop();
     }
 
@@ -296 +337 @@
     }
 
-    private static class JarFilter implements FilenameFilter {
-        public boolean accept(File dir, String name) {
-            return name.toLowerCase().endsWith(".jar");
-        }
-    }
-
     private static class FileNameComparator implements Comparator<File> {
         public int compare(File o1, File o2) {