From 13d5b3e98954c2ade382305f8d044b2b49fdbd0b Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Mon, 8 Oct 2012 08:11:51 +0300 Subject: Bootstrap UI using relative URLs with servlets (#6771) * Configure widgetset using URLs relative to the requested page * Provide a Util method for getting an absolute URL from a relative URL * Test by using an embedded Jetty acting as a transparent proxy * Make /embed1 use the Buttons test to enable testing UIDL requests Change-Id: I4ef9b40e3954ae16b682d743a339f4360db40d4d --- shared/src/com/vaadin/shared/ApplicationConstants.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'shared') diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index 2c0c0c4af0..079aa492cc 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -39,7 +39,9 @@ public class ApplicationConstants { @Deprecated public static final String UPDATE_VARIABLE_METHOD = "v"; - public static final String PORTLET_RESOUCE_URL_BASE = "portletAppURLBase"; + public static final String SERVICE_URL = "serviceUrl"; + + public static final String SERVICE_URL_PATH_AS_PARAMETER = "usePathParameter"; public static final String V_RESOURCE_PATH = "v-resourcePath"; @@ -52,4 +54,14 @@ public class ApplicationConstants { * changes. */ public static final String URL_PARAMETER_REPAINT_ALL = "repaintAll"; + + /** + * Configuration parameter giving the (in some cases relative) URL to the + * VAADIN folder from where themes and widgetsets are loaded. + *

+ * Refactor warning: This value is also hardcoded in + * vaadinBootstrap.js. + *

+ */ + public static final String VAADIN_DIR_URL = "vaadinDir"; } -- cgit v1.2.3