Merge changes from origin/7.1

9100cfc Do not rely on broken javadoc features for default values (#11970)
fad7bf7 Remove DEFAULT constant as an annotation enum cannot use it (#11966)
1f14422 Merge changes from origin/7.0
9b38072 Exclude provided portal-service from all zip (#9823)
8f4add9 Fixed button highlighting when dragging #10917
8eb567e Make UI.pushConnection transient to prevent null resource after deserialization (#11809)
9efd4d6 Fixed test issues
1b0a214 Pass ConversionException to getConversionError (#11960)
bca14c0 Correctly report theme version in the debug window (#11442)
f9bffed Fix for NPE in debug window in IE (#12015)
da29e2b Fixed serialization issues
a5ec937 Info section for the debug window (#12019)
d6fca78 Fix race condition in upload with push (#10214)
e7201fd Allow using element resize listeners from javascript connectors (#11996)
e853280 Print warning if in production mode and theme compilation is required (#12031)
d9becf9 Use vaadin-atmosphere without slf4j dependency (#11765)
37bc9e4 Reformatted using Ant editor (#12040)
5adb5c2 Include compatibility web.xml in uitest.war (#11688)
424af57 Move ClientConnector.setParent to Component and Extension (#11777)
074d7b3 Fixed incorrect line breaks (#12040)
2cada0b Reformatted release notes using Eclipse (4 spaces)
a0182a0 Updated release notes for 7.1.0 (#11993, #11991, #11870)
5793a1c Make VaadinServlet use enclosing UI class by default (#12039)
3d9d47d Added type parameter to converter methods (#11895)
ecc2de3 Removed dead code

Change-Id: I68ad269dc46ac03d7285b92e0ebdcd3eda059629

2 files changed, 6 insertions, 7 deletions

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/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
      */