diff options
| author | Artur Signell <artur@vaadin.com> | 2015-03-19 09:49:32 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-03-25 11:37:42 +0000 |
| commit | 140844eaff3de1b926460081405eb7d53ec811f8 (patch) | |
| tree | 22df06e4607937bbbb8b299beb05d6f4acb8de16 /shared | |
| parent | 1c569304b3f10960854c2045030d907408978d05 (diff) | |
| download | vaadin-framework-140844eaff3de1b926460081405eb7d53ec811f8.tar.gz vaadin-framework-140844eaff3de1b926460081405eb7d53ec811f8.zip | |
Revert "Make push path configurable (#14432)."
Breaks long polling fallback when implemented this way
This reverts commit 735f0748344d7ee594c4e52a715d867dfdb23cb1.
Conflicts:
push/build.xml
push/ivy.xml
server/src/com/vaadin/server/Constants.java
uitest/src/com/vaadin/tests/push/PushPathTest.java
Change-Id: I07f6fedafc648b0ee403865ccb322017d2a8d571
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, 7 insertions, 6 deletions
diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index 990564a6b8..d7aaee6267 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -28,6 +28,8 @@ 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"; @@ -74,7 +76,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"; @@ -88,7 +90,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"; @@ -100,14 +102,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"; @@ -116,7 +118,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 04e182c5d4..2f51fef6ee 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -110,7 +110,6 @@ 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 |