diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-12 09:13:17 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-12 09:13:17 +0300 |
| commit | 38cfb0d8eaaa9c146a394558260d2a7e36b6e414 (patch) | |
| tree | d30714f0c98a7819ebee188278214390b22daded /server | |
| parent | 808b65581554dad8b670538b1830a8f90b3db5db (diff) | |
| parent | a9ff7993c2f0e3f3412ef68a236aa2eb02385c64 (diff) | |
| download | vaadin-framework-38cfb0d8eaaa9c146a394558260d2a7e36b6e414.tar.gz vaadin-framework-38cfb0d8eaaa9c146a394558260d2a7e36b6e414.zip | |
Merge commit 'a9ff7993c2f0e3f3412ef68a236aa2eb02385c64'
Conflicts:
server/src/com/vaadin/ui/UI.java
Change-Id: I5919e3138b6eacde6b3db843f5f05425b30d7b99
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 1 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/VaadinService.java | 3 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/VaadinSession.java | 1 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/UI.java | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 2c041e3cf8..7d3201efdf 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -116,6 +116,7 @@ public interface Constants { static final String URL_PARAMETER_THEME = "theme"; static final String SERVLET_PARAMETER_PRODUCTION_MODE = "productionMode"; + // Javadocs for VaadinService should be updated if this value is changed static final String SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION = "disable-xsrf-protection"; static final String SERVLET_PARAMETER_RESOURCE_CACHE_TIME = "resourceCacheTime"; static final String SERVLET_PARAMETER_HEARTBEAT_INTERVAL = "heartbeatInterval"; diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java index a040c72175..18dc468cb0 100644 --- a/server/src/com/vaadin/server/VaadinService.java +++ b/server/src/com/vaadin/server/VaadinService.java @@ -1584,8 +1584,7 @@ public abstract class VaadinService implements Serializable { * This protection is enabled by default, but it might need to be disabled * to allow a certain type of testing. For these cases, the check can be * disabled by setting the init parameter - * {@value Constants#SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION} to - * <code>true</code>. + * <code>disable-xsrf-protection</code> to <code>true</code>. * * @see DeploymentConfiguration#isXsrfProtectionEnabled() * diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/com/vaadin/server/VaadinSession.java index e0a5b51baa..82f245594f 100644 --- a/server/src/com/vaadin/server/VaadinSession.java +++ b/server/src/com/vaadin/server/VaadinSession.java @@ -133,6 +133,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * The name of the parameter that is by default used in e.g. web.xml to * define the name of the default {@link UI} class. */ + // javadoc in UI should be updated if this value is changed public static final String UI_PARAMETER = "UI"; private static final Method BOOTSTRAP_FRAGMENT_METHOD = ReflectTools diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 9135151089..9f2039de72 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -74,7 +74,7 @@ import com.vaadin.util.CurrentInstance; * browser window which points to e.g. {@link VaadinServlet}, all * {@link UIProvider}s registered to the current {@link VaadinSession} are * queried for the UI class that should be used. The selection is by default - * based on the {@value VaadinSession#UI_PARAMETER} parameter from web.xml. + * based on the <code>UI</code> init parameter from web.xml. * </p> * <p> * After a UI has been created by the application, it is initialized using |