From 3bd6f9497e0fe5755850e1e2e132a45f817905c2 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 6 Apr 2011 09:43:35 +0000
Subject: [PATCH] fixes #6772: Application resources and stream variables now
 relatively parsed on the client side -> works better in some reverse proxy
 setups

svn changeset:18126/svn branch:6.5
---
 src/com/vaadin/terminal/PaintTarget.java              |  5 +++++
 .../terminal/gwt/client/ApplicationConnection.java    |  3 +++
 src/com/vaadin/terminal/gwt/client/ui/VUpload.java    |  4 +++-
 .../terminal/gwt/server/CommunicationManager.java     |  5 ++---
 .../vaadin/terminal/gwt/server/JsonPaintTarget.java   | 11 +----------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/com/vaadin/terminal/PaintTarget.java b/src/com/vaadin/terminal/PaintTarget.java
index a81c637de2..d118562588 100644
--- a/src/com/vaadin/terminal/PaintTarget.java
+++ b/src/com/vaadin/terminal/PaintTarget.java
@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.util.Map;
 
 import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
 
 /**
  * This interface defines the methods for painting XML to the UIDL stream.
@@ -158,6 +159,10 @@ public interface PaintTarget extends Serializable {
      * terminals Receivers are typically rendered for the client side as URLs,
      * where the client side implementation can do an http post request.
      * <p>
+     * The urls in UIDL message may use Vaadin specific protocol. Before
+     * actually using the urls on the client side, they should be passed via
+     * {@link ApplicationConnection#translateVaadinUri(String)}.
+     * <p>
      * Note that in current terminal implementation StreamVariables are cleaned
      * from the terminal only when:
      * <ul>
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index a8b1909dab..b0cf4945f0 100755
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -2142,6 +2142,9 @@ public class ApplicationConnection {
             }
             uidlUri = themeUri + uidlUri.substring(7);
         }
+        if (uidlUri.startsWith("app://")) {
+            uidlUri = getAppUri() + uidlUri.substring(6);
+        }
         return uidlUri;
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
index f267f97860..dc9b5ba545 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
@@ -147,7 +147,9 @@ public class VUpload extends SimplePanel implements Paintable {
         this.client = client;
         paintableId = uidl.getId();
         nextUploadId = uidl.getIntAttribute("nextid");
-        element.setAction(uidl.getStringVariable("action"));
+        final String action = client.translateVaadinUri(uidl
+                .getStringVariable("action"));
+        element.setAction(action);
         submitButton.setText(uidl.getStringAttribute("buttoncaption"));
         fu.setName(paintableId + "_file");
 
diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index 111f43b31f..5851621a20 100644
--- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -396,9 +396,8 @@ public class CommunicationManager extends AbstractCommunicationManager {
             streamVariableToSeckey.put(value, seckey);
         }
 
-        return getApplication().getURL()
-                + AbstractApplicationServlet.UPLOAD_URL_PREFIX + key + "/"
-                + seckey;
+        return "app://" + AbstractApplicationServlet.UPLOAD_URL_PREFIX + key
+                + "/" + seckey;
 
     }
 
diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 8c8ab1e1be..080ff33af5 100644
--- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -371,16 +371,7 @@ public class JsonPaintTarget implements PaintTarget {
                         "Application not specified for resorce "
                                 + value.getClass().getName());
             }
-            String uri;
-            if (a.getURL() != null) {
-                uri = a.getURL().getPath();
-            } else {
-                uri = "";
-            }
-            if (uri.length() > 0 && uri.charAt(uri.length() - 1) != '/') {
-                uri += "/";
-            }
-            uri += a.getRelativeLocation(r);
+            final String uri = "app://" + a.getRelativeLocation(r);
             addAttribute(name, uri);
 
         } else if (value instanceof ThemeResource) {
-- 
2.39.5