Removed obsolete (?) pathInfo, previously (a very long time ago) used to identify...

svn changeset:16778/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index f57a465bb24e046cd9bd3cc523f891ef16276bdc..281b6f4d16f106f14787ccf7a57727fcf9f610cd 100644 (file)
--- 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 bc52611abc9490711be340d5ee7b513631564a65..f52c42972422aa24c6d411591d7b546274f8642a 100755 (executable)
--- 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 130474ae1b1f46f17c96c36a32755af986d624af..250299905f52355aef8250175e192e5a21afff07 100644 (file)
--- 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 e8af424935fec047ae3522eb366760fbf3716c25..38794da9485188dda96252f19660c94e03eeff22 100644 (file)
--- 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("/")) {