diff options
| author | Tapio Aali <tapio@vaadin.com> | 2015-02-09 15:37:41 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-02-18 14:44:27 +0000 |
| commit | 735f0748344d7ee594c4e52a715d867dfdb23cb1 (patch) | |
| tree | a1a940c03cb1595e30486ddaa5cb1f64d61e412f /shared | |
| parent | d23382ad25b0a9f1ab1bf864f8fd3746e5b1c320 (diff) | |
| download | vaadin-framework-735f0748344d7ee594c4e52a715d867dfdb23cb1.tar.gz vaadin-framework-735f0748344d7ee594c4e52a715d867dfdb23cb1.zip | |
Make push path configurable (#14432).
In order to use websockets with Weblogic 12.1.2 or later, push path 'ws'
needs to be used instead of 'PUSH'.
Change-Id: Ia90d11c20a375cef9cf4a53986a70d616a83db06
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/com/vaadin/shared/ApplicationConstants.java | 12 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/ui/UIState.java | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index d7aaee6267..990564a6b8 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -28,8 +28,6 @@ public class ApplicationConstants implements Serializable { public static final String HEARTBEAT_PATH = "HEARTBEAT"; - public static final String PUSH_PATH = "PUSH"; - public static final String PUBLISHED_FILE_PATH = APP_PATH + '/' + "PUBLISHED"; @@ -76,7 +74,7 @@ public class ApplicationConstants implements Serializable { /** * The name of the javascript containing the bootstrap code. The file is * located in the VAADIN directory. - * + * * @since 7.3 */ public static final String VAADIN_BOOTSTRAP_JS = "vaadinBootstrap.js"; @@ -90,7 +88,7 @@ public class ApplicationConstants implements Serializable { /** * The name of the debug version of the javascript containing push support. * The file is located in the VAADIN directory. - * + * * @since 7.1.6 */ public static final String VAADIN_PUSH_DEBUG_JS = "vaadinPush.debug.js"; @@ -102,14 +100,14 @@ public class ApplicationConstants implements Serializable { /** * The name of the parameter used to transmit RPC invocations - * + * * @since 7.2 */ public static final String RPC_INVOCATIONS = "rpc"; /** * The name of the parameter used to transmit the CSRF token - * + * * @since 7.2 */ public static final String CSRF_TOKEN = "csrfToken"; @@ -118,7 +116,7 @@ public class ApplicationConstants implements Serializable { * The name of the parameter used to transmit the sync id. The value can be * set to -1 e.g. when testing with pre-recorded requests to make the * framework ignore the sync id. - * + * * @see com.vaadin.ui.ConnectorTracker#getCurrentSyncId() * @since 7.2 */ diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java index 2f51fef6ee..04e182c5d4 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -110,6 +110,7 @@ public class UIState extends TabIndexState { public static final String FALLBACK_TRANSPORT_PARAM = "fallbackTransport"; public PushMode mode = PushMode.DISABLED; + public String pushPath; public Map<String, String> parameters = new HashMap<String, String>(); { parameters |