Sfoglia il codice sorgente

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

Change-Id: Ie801a17ed1eff29a7dc6be61755241777071ab8f
tags/7.3.2
Taras Hupalo 9 anni fa
parent
commit
07ccd65b98

+ 2
- 0
server/src/com/vaadin/server/Constants.java Vedi File

@@ -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";
}

+ 5
- 1
server/src/com/vaadin/server/VaadinPortletService.java Vedi File

@@ -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() {

Loading…
Annulla
Salva