Repository: incubator-guacamole-client Updated Branches: refs/heads/master fa0746039 -> 6a2235eff
GUACAMOLE-208: Define and document new status codes. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/bc97fc82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/bc97fc82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/bc97fc82 Branch: refs/heads/master Commit: bc97fc8246155e02bc99ce8fd64907942316fd8f Parents: fa07460 Author: Michael Jumper <[email protected]> Authored: Sat Feb 11 14:02:58 2017 -0800 Committer: Michael Jumper <[email protected]> Committed: Wed Feb 15 21:24:39 2017 -0800 ---------------------------------------------------------------------- .../src/main/webapp/modules/Status.js | 39 ++++++++++++++++++++ .../guacamole/protocol/GuacamoleStatus.java | 29 +++++++++++++++ 2 files changed, 68 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/bc97fc82/guacamole-common-js/src/main/webapp/modules/Status.js ---------------------------------------------------------------------- diff --git a/guacamole-common-js/src/main/webapp/modules/Status.js b/guacamole-common-js/src/main/webapp/modules/Status.js index 457dc3c..ceadaa6 100644 --- a/guacamole-common-js/src/main/webapp/modules/Status.js +++ b/guacamole-common-js/src/main/webapp/modules/Status.js @@ -141,6 +141,45 @@ Guacamole.Status.Code = { "RESOURCE_CLOSED": 0x0206, /** + * The operation could not be performed because the upstream server does + * not appear to exist. + * + * @type {Number} + */ + "UPSTREAM_NOT_FOUND": 0x0207, + + /** + * The operation could not be performed because the upstream server is not + * available to service the request. + * + * @type {Number} + */ + "UPSTREAM_UNAVAILABLE": 0x0208, + + /** + * The session within the upstream server has ended because it conflicted + * with another session. + * + * @type {Number} + */ + "SESSION_CONFLICT": 0x0209, + + /** + * The session within the upstream server has ended because it appeared to + * be inactive. + * + * @type {Number} + */ + "SESSION_TIMEOUT": 0x020A, + + /** + * The session within the upstream server has been forcibly terminated. + * + * @type {Number} + */ + "SESSION_CLOSED": 0x020B, + + /** * The operation could not be performed because bad parameters were given. * * @type {Number} http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/bc97fc82/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java ---------------------------------------------------------------------- diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java index a5e84c6..56ab2ef 100644 --- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java +++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java @@ -72,6 +72,35 @@ public enum GuacamoleStatus { RESOURCE_CONFLICT(409, 1008, 0x0205), /** + * The operation could not be performed because the upstream server does + * not appear to exist. + */ + UPSTREAM_NOT_FOUND(502, 1011, 0x0207), + + /** + * The operation could not be performed because the upstream server is not + * available to service the request. + */ + UPSTREAM_UNAVAILABLE(502, 1011, 0x0208), + + /** + * The session within the upstream server has ended because it conflicted + * with another session. + */ + SESSION_CONFLICT(409, 1008, 0x0209), + + /** + * The session within the upstream server has ended because it appeared to + * be inactive. + */ + SESSION_TIMEOUT(408, 1002, 0x020A), + + /** + * The session within the upstream server has been forcibly terminated. + */ + SESSION_CLOSED(404, 1002, 0x020B), + + /** * The operation could not be performed because bad parameters were given. */ CLIENT_BAD_REQUEST(400, 1002, 0x0300),
