From 656c0ec571e397387a1e9d3ea342f951ad7a11ad Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Tue, 4 Jan 2011 08:37:34 +0000 Subject: [PATCH] Removed obsolete (?) pathInfo, previously (a very long time ago) used to identify UIDL requests. Nowdays all UIDL request goes to same APPURI/UIDL uri, the window identification happens based on request parameter svn changeset:16778/svn branch:6.5 --- .../terminal/gwt/client/ApplicationConfiguration.java | 6 ------ .../vaadin/terminal/gwt/client/ApplicationConnection.java | 2 +- .../terminal/gwt/server/AbstractApplicationServlet.java | 8 -------- .../terminal/gwt/server/AbstractCommunicationManager.java | 3 --- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index f57a465bb2..281b6f4d16 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -38,7 +38,6 @@ public class ApplicationConfiguration implements EntryPoint { private String id; private String themeUri; - private String pathInfo; private String appUri; private JavaScriptObject versionInfo; private String windowName; @@ -88,10 +87,6 @@ public class ApplicationConfiguration implements EntryPoint { return appUri; } - public String getPathInfo() { - return pathInfo; - } - public String getThemeUri() { return themeUri; } @@ -147,7 +142,6 @@ public class ApplicationConfiguration implements EntryPoint { uri = uri + "/"; } this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::appUri = uri; - this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::pathInfo = jsobj.pathInfo; this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::themeUri = jsobj.themeUri; if(jsobj.windowName) { this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::windowName = jsobj.windowName; diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index bc52611abc..f52c429724 100755 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -397,7 +397,7 @@ public class ApplicationConnection { if (configuration.usePortletURLs()) { uri = configuration.getPortletUidlURLBase(); } else { - uri = getAppUri() + "UIDL" + configuration.getPathInfo(); + uri = getAppUri() + "UIDL"; } if (extraParams != null && extraParams.length() > 0) { diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 130474ae1b..250299905f 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1825,14 +1825,6 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements page.write("vaadin.vaadinConfigurations[\"" + appId + "\"] = {"); page.write("appUri:'" + appUrl + "', "); - String pathInfo = getRequestPathInfo(request); - if (pathInfo == null) { - pathInfo = "/"; - } else { - pathInfo = JsonPaintTarget.escapeJSON(pathInfo); - } - - page.write("pathInfo: \"" + pathInfo + "\", "); if (window != application.getMainWindow()) { page.write("windowName: '" + window.getName() + "', "); } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index e8af424935..38794da948 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -1769,9 +1769,6 @@ public abstract class AbstractCommunicationManager implements // Get the path from URL String path = callback.getRequestPathInfo(request); - if (path != null && path.startsWith("/UIDL")) { - path = path.substring("/UIDL".length()); - } // If the path is specified, create name from it if (path != null && path.length() > 0 && !path.equals("/")) { -- 2.39.5