fixes #6861, regression from #6772

svn changeset:18364/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
index 0504e02787b0e38a1baf5fcf106d2e1531f26064..02218f4bc213db574dac75670ba414904404cdbe 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
@@ -165,9 +165,9 @@ public abstract class AbstractWebApplicationContext implements
 
         final String filename = resource.getFilename();
         if (filename == null) {
-            return "APP/" + mapKey + "/";
+            return "app://APP/" + mapKey + "/";
         } else {
-            return "APP/" + mapKey + "/" + filename;
+            return "app://APP/" + mapKey + "/" + filename;
         }
 
     }

diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 080ff33af53ae2a89cb265a21f1506b2861cef88..8b1e776b4c9a27db3f7cd581e5676a218b1b0cf9 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -371,7 +371,7 @@ public class JsonPaintTarget implements PaintTarget {
                         "Application not specified for resorce "
                                 + value.getClass().getName());
             }
-            final String uri = "app://" + a.getRelativeLocation(r);
+            final String uri = a.getRelativeLocation(r);
             addAttribute(name, uri);
 
         } else if (value instanceof ThemeResource) {