From 9100cfc70255f95982f230f29ef72dffe46027d5 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 5 Jun 2013 15:04:25 +0300
Subject: Do not rely on broken javadoc features for default values (#11970)

Change-Id: Ic904a33e31b54da7c1324c70b792c38ee1b56fac
---
 .../com/vaadin/annotations/VaadinServletConfiguration.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'server/src/com/vaadin/annotations')

diff --git a/server/src/com/vaadin/annotations/VaadinServletConfiguration.java b/server/src/com/vaadin/annotations/VaadinServletConfiguration.java
index 38e3ff2ef0..e65869c27a 100644
--- a/server/src/com/vaadin/annotations/VaadinServletConfiguration.java
+++ b/server/src/com/vaadin/annotations/VaadinServletConfiguration.java
@@ -84,8 +84,7 @@ public @interface VaadinServletConfiguration {
 
     /**
      * The time resources can be cached in the browser, in seconds. The default
-     * value is
-     * {@value DefaultDeploymentConfiguration#DEFAULT_RESOURCE_CACHE_TIME}.
+     * value is 3600 seconds, i.e. one hour.
      * 
      * @return the resource cache time
      * 
@@ -96,8 +95,8 @@ public @interface VaadinServletConfiguration {
 
     /**
      * The number of seconds between heartbeat requests of a UI, or a
-     * non-positive number if heartbeat is disabled. The default value is
-     * {@value DefaultDeploymentConfiguration#DEFAULT_HEARTBEAT_INTERVAL}.
+     * non-positive number if heartbeat is disabled. The default value is 300
+     * seconds, i.e. 5 minutes.
      * 
      * @return the time between heartbeats
      * 
@@ -109,7 +108,7 @@ public @interface VaadinServletConfiguration {
     /**
      * Whether a session should be closed when all its open UIs have been idle
      * for longer than its configured maximum inactivity time. The default value
-     * is {@value DefaultDeploymentConfiguration#DEFAULT_CLOSE_IDLE_SESSIONS}.
+     * is <code>false</code>.
      * 
      * @return true if UIs and sessions receiving only heartbeat requests are
      *         eventually closed; false if heartbeat requests extend UI and
@@ -122,7 +121,7 @@ public @interface VaadinServletConfiguration {
 
     /**
      * The default widgetset to use for the servlet. The default value is
-     * {@value VaadinServlet#DEFAULT_WIDGETSET}.
+     * <code>com.vaadin.DefaultWidgetSet</code>.
      * 
      * @return the default widgetset name
      */
-- 
cgit v1.2.3


From fad7bf7a791db16349467ccbc508d0e472330fa0 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 5 Jun 2013 18:21:44 +0300
Subject: Remove DEFAULT constant as an annotation enum cannot use it (#11966)

Change-Id: I41630fec5c40c50a2925499d1f1ba23149ab0de1
---
 server/src/com/vaadin/annotations/Push.java       |  2 +-
 shared/src/com/vaadin/shared/ui/ui/Transport.java | 10 ----------
 shared/src/com/vaadin/shared/ui/ui/UIState.java   |  5 +++--
 3 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'server/src/com/vaadin/annotations')

diff --git a/server/src/com/vaadin/annotations/Push.java b/server/src/com/vaadin/annotations/Push.java
index d5e42d6f60..9965d535ba 100644
--- a/server/src/com/vaadin/annotations/Push.java
+++ b/server/src/com/vaadin/annotations/Push.java
@@ -54,6 +54,6 @@ public @interface Push {
      * 
      * @return the transport type to use
      */
-    public Transport transport() default Transport.DEFAULT;
+    public Transport transport() default Transport.WEBSOCKET;
 
 }
diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/com/vaadin/shared/ui/ui/Transport.java
index 69d713bcca..ea641c0a3c 100644
--- a/shared/src/com/vaadin/shared/ui/ui/Transport.java
+++ b/shared/src/com/vaadin/shared/ui/ui/Transport.java
@@ -32,16 +32,6 @@ public enum Transport {
      */
     STREAMING("streaming");
 
-    /**
-     * The default transport mechanism for push
-     */
-    public static final Transport DEFAULT = Transport.WEBSOCKET;
-
-    /**
-     * The default fallback transport mechanism for push
-     */
-    public static final Transport DEFAULT_FALLBACK = Transport.STREAMING;
-
     private String identifier;
 
     private Transport(String identifier) {
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index e19a87ada9..8d042a835f 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -55,9 +55,10 @@ public class UIState extends TabIndexState {
         public PushMode mode = PushMode.DISABLED;
         public Map<String, String> parameters = new HashMap<String, String>();
         {
-            parameters.put(TRANSPORT_PARAM, Transport.DEFAULT.getIdentifier());
+            parameters
+                    .put(TRANSPORT_PARAM, Transport.WEBSOCKET.getIdentifier());
             parameters.put(FALLBACK_TRANSPORT_PARAM,
-                    Transport.DEFAULT_FALLBACK.getIdentifier());
+                    Transport.STREAMING.getIdentifier());
         }
     }
 
-- 
cgit v1.2.3