Changeset 5326 for branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/config/includes/IncludesResolver.java

Timestamp:

08/30/10 00:30:11 (21 months ago)

Author:

mtld

Message:

added config-include support for modules

Files:

• branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/config/includes/IncludesResolver.java (modified) (4 diffs)

branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/config/includes/IncludesResolver.java

@@ -38 +38 @@
 import com.marsching.flexiparse.util.DOMBasedNamespaceContext;
 
-import de.schlund.pfixxml.resources.FileResource;
+import de.schlund.pfixxml.resources.Resource;
 import de.schlund.pfixxml.resources.ResourceUtil;
 import de.schlund.pfixxml.util.Generics;
@@ -117 +117 @@
             }
 
+            String module = elem.getAttribute("module");
+            if(module.equals("")) module = null;
+            
             String filepath = elem.getAttribute("file");
             if (filepath == null) {
                 throw new SAXException("The attribute \"file\" must be set for the include tag!");
             }
+            if(module != null) {
+                if(filepath.startsWith("/")) filepath = filepath.substring(1);
+                filepath = "module://" + module + "/" + filepath;
+            }
+            
 
             // Look if the same include has been performed ealier in the recursion
@@ -133 +141 @@
             }
             
-            FileResource includeFile = ResourceUtil.getFileResourceFromDocroot(filepath);
+            Resource includeFile = ResourceUtil.getResource(filepath);
             Document includeDocument;
             try {
+                System.out.println(">>>>>>>>>>>> PARSE: "+includeFile.toString());
                 includeDocument = Xml.parseMutable(includeFile);
             } catch (IOException e) {
@@ -164 +173 @@
                 Node node = includeNodes.item(i);
                 Node newNode = doc.importNode(node, true);
+                if(module != null) {
+                        newNode.setUserData("module", module, null);
+                }
                 elem.getParentNode().insertBefore(newNode, elem);
             }