diff options
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/ivy.xml | 2 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ApplicationConstants.java | 14 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/ui/UIConstants.java | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/shared/ivy.xml b/shared/ivy.xml index 2c4b65a389..4cd0df88a1 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -22,6 +22,8 @@ <dependencies> <dependency org="org.json" name="json" rev="20080701" conf="build,ide,tests->default" /> + <dependency org="com.vaadin" name="vaadin-shared-deps" + rev="1.0.0" conf="build,ide,tests->default" /> </dependencies> </ivy-module> 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. + * <p> + * <b>Refactor warning:</b> This value is also hardcoded in + * vaadinBootstrap.js. + * </p> + */ + public static final String VAADIN_DIR_URL = "vaadinDir"; } diff --git a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java b/shared/src/com/vaadin/shared/ui/ui/UIConstants.java index 76413628a4..06a4afae98 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIConstants.java @@ -26,7 +26,7 @@ public class UIConstants { public static final String NOTIFICATION_HTML_CONTENT_NOT_ALLOWED = "useplain"; @Deprecated - public static final String FRAGMENT_VARIABLE = "fragment"; + public static final String LOCATION_VARIABLE = "location"; @Deprecated public static final String ATTRIBUTE_NOTIFICATION_STYLE = "style"; |