Changeset 5331 for branches/release-0.15.x/pustefix-live/src/main/java/org/pustefixframework/live/LiveResolver.java

Timestamp:

09/01/10 12:13:15 (21 months ago)

Author:

seelmann

Message:

svn diff

Files:

• branches/release-0.15.x/pustefix-live/src/main/java/org/pustefixframework/live/LiveResolver.java (modified) (1 diff)

branches/release-0.15.x/pustefix-live/src/main/java/org/pustefixframework/live/LiveResolver.java

@@ -123 +123 @@
     public URL resolveLiveDocroot(String docroot, String path) throws Exception {
 
-        if (getLiveJarInfo().hasWarEntries()) {
+        if (getLiveJarInfo().hasWarEntries() && !docroot.endsWith("src/main/webapp")) {
             // live.xml defines live folders for web applications, use this information
             if (LOG.isDebugEnabled()) {