From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 18 Apr 2011 15:11:50 +0000 (+0000)
Subject: fixes #6861, regression from #6772
X-Git-Tag: 6.7.0.beta1~234^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d80fd142d10b6ffc84f13b0e4c80ace86d65ea0;p=vaadin-framework.git

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 0504e02787..02218f4bc2 100644
--- 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 080ff33af5..8b1e776b4c 100644
--- 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) {