Added support PORTLET_CONTEXT for vaadin.resources.path value (#14640)

Change-Id: Ie801a17ed1eff29a7dc6be61755241777071ab8f

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 2b868c12a6188f2e9205ea5af4349bb25cc955ca..fc0bf7381ab496bcaa81983b9999532fc3ca9bb7 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -162,4 +162,6 @@ public interface Constants {
     static final String PORTAL_PARAMETER_VAADIN_WIDGETSET = "vaadin.widgetset";
     static final String PORTAL_PARAMETER_VAADIN_RESOURCE_PATH = "vaadin.resources.path";
     static final String PORTAL_PARAMETER_VAADIN_THEME = "vaadin.theme";
+
+    static final String PORTLET_CONTEXT = "PORTLET_CONTEXT";
 }

diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index 2b290b4cc4247c69132170da0f7eb75d0d2d7fbb..c6d9b8e46afaba21dd11850aa2b5fc11961f7cde 100644 (file)
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -162,7 +162,11 @@ public class VaadinPortletService extends VaadinService {
         String staticFileLocation = getParameter(request,
                 Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH, "/html");
 
-        return trimTrailingSlashes(staticFileLocation);
+        if (Constants.PORTLET_CONTEXT.equals(staticFileLocation)) {
+            return request.getContextPath();
+        } else{
+            return trimTrailingSlashes(staticFileLocation);
+        }
     }
 
     private PortletContext getPortletContext() {