Changeset 5332 for branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/IncludeDocumentExtension.java

Timestamp:

09/01/10 15:58:37 (21 months ago)

Author:

mtld

Message:

module enhancements (Ticket #118 + #119)

Files:

• branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/IncludeDocumentExtension.java (modified) (1 diff)

branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/IncludeDocumentExtension.java

@@ -132 +132 @@
             if(dynamic) {
                 uriStr = "dynamic:/" + path_str + "?part=" + part + "&parent=" + parent_uri_str;
-                if(module != null) uriStr += "&module="+module;
-                else if("module".equals(parentURI.getScheme())) {
-                    uriStr += "&module="+parentURI.getAuthority();
+                if(!"WEBAPP".equalsIgnoreCase(module)) {
+                    if(module != null) uriStr += "&module="+module;
+                    else if("module".equals(parentURI.getScheme())) {
+                        uriStr += "&module="+parentURI.getAuthority();
+                    }
                 }
             } else {
-                if(module != null) {
-                    uriStr = "module://" + module + "/" + path_str;
-                } else if("module".equals(parentURI.getScheme())) {
-                    uriStr = "module://" + parentURI.getAuthority() + "/" + path_str;
+                if(!"WEBAPP".equalsIgnoreCase(module)) {
+                    if(module != null) {
+                        uriStr = "module://" + module + "/" + path_str;
+                    } else if("module".equals(parentURI.getScheme())) {
+                        uriStr = "module://" + parentURI.getAuthority() + "/" + path_str;
+                    }
                 }
             }