Merge 1.1.0 changes to master.

guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java

@@ -20,8 +20,9 @@
 package org.apache.guacamole.form;
 
 /**
- * Represents a time zone field. The field may contain only valid time zone IDs,
- * as dictated by TimeZone.getAvailableIDs().
+ * Represents a time zone field. The field may contain only valid time zone
+ * identifiers, as defined by the IANA time zone database. Such identifiers are
+ * also valid Java time zone IDs as dictated by TimeZone.getAvailableIDs().
  */
 public class TimeZoneField extends Field {
 

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json

@@ -108,7 +108,7 @@
                 },
                 {
                     "name"  : "timezone",
-                    "type"  : "TEXT"
+                    "type"  : "TIMEZONE"
                 },
                 {
                     "name"    : "console",

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json

@@ -96,7 +96,7 @@
                 },
                 {
                     "name"  : "timezone",
-                    "type"  : "TEXT"
+                    "type"  : "TIMEZONE"
                 },
                 {
                     "name"  : "server-alive-interval",

guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js

@@ -19,8 +19,9 @@
 
 
 /**
- * Controller for time zone fields. Time zone fields use Java IDs as the
- * standard representation for each supported time zone.
+ * Controller for time zone fields. Time zone fields use IANA time zone
+ * database identifiers as the standard representation for each supported time
+ * zone. These identifiers are also legal Java time zone IDs.
  */
 angular.module('form').controller('timeZoneFieldController', ['$scope', '$injector',
     function timeZoneFieldController($scope, $injector) {
@@ -418,7 +419,6 @@ angular.module('form').controller('timeZoneFieldController', ['$scope', '$inject
         "Canada" : {
             "Atlantic"          : "Canada/Atlantic",
             "Central"           : "Canada/Central",
-            "East-Saskatchewan" : "Canada/East-Saskatchewan",
             "Eastern"           : "Canada/Eastern",
             "Mountain"          : "Canada/Mountain",
             "Newfoundland"      : "Canada/Newfoundland",