You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/04/21 04:05:58 UTC
[1/4] incubator-guacamole-client git commit: GUACAMOLE-208: Define
missing exception for the RESOURCE_CLOSED status code.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master e8f4cd551 -> 66dc1e6af
GUACAMOLE-208: Define missing exception for the RESOURCE_CLOSED status code.
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/32610e9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/32610e9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/32610e9a
Branch: refs/heads/master
Commit: 32610e9af225a9e7eeb63707048434c42ad5c702
Parents: bfc2f2e
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Apr 16 23:12:24 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Apr 16 23:13:03 2017 -0700
----------------------------------------------------------------------
.../GuacamoleResourceClosedException.java | 69 ++++++++++++++++++++
1 file changed, 69 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/32610e9a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceClosedException.java
----------------------------------------------------------------------
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceClosedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceClosedException.java
new file mode 100644
index 0000000..e1cc6d9
--- /dev/null
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceClosedException.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole;
+
+import org.apache.guacamole.protocol.GuacamoleStatus;
+
+/**
+ * An exception which is thrown when a resource is no longer available because
+ * it is closed.
+ */
+public class GuacamoleResourceClosedException extends GuacamoleClientException {
+
+ /**
+ * Creates a new GuacamoleResourceClosedException with the given message
+ * and cause.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleResourceClosedException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Creates a new GuacamoleResourceClosedException with the given message.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ */
+ public GuacamoleResourceClosedException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a new GuacamoleResourceClosedException with the given cause.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleResourceClosedException(Throwable cause) {
+ super(cause);
+ }
+
+ @Override
+ public GuacamoleStatus getStatus() {
+ return GuacamoleStatus.RESOURCE_CLOSED;
+ }
+
+}
[2/4] incubator-guacamole-client git commit: GUACAMOLE-208: Define
exceptions for the new SESSION_CLOSED, SESSION_CONFLICT,
and SESSION_TIMEOUT status codes.
Posted by jm...@apache.org.
GUACAMOLE-208: Define exceptions for the new SESSION_CLOSED, SESSION_CONFLICT, and SESSION_TIMEOUT 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/bfc2f2e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/bfc2f2e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/bfc2f2e7
Branch: refs/heads/master
Commit: bfc2f2e7eb5634c037e98e1a33d74154385d67f1
Parents: 82e9967
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Apr 16 23:11:34 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Apr 16 23:13:03 2017 -0700
----------------------------------------------------------------------
.../GuacamoleSessionClosedException.java | 69 ++++++++++++++++++++
.../GuacamoleSessionConflictException.java | 69 ++++++++++++++++++++
.../GuacamoleSessionTimeoutException.java | 69 ++++++++++++++++++++
3 files changed, 207 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/bfc2f2e7/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionClosedException.java
----------------------------------------------------------------------
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionClosedException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionClosedException.java
new file mode 100644
index 0000000..90ff86d
--- /dev/null
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionClosedException.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole;
+
+import org.apache.guacamole.protocol.GuacamoleStatus;
+
+/**
+ * An exception which indicates that a session within an upstream server (such
+ * as the remote desktop) has been forcibly terminated.
+ */
+public class GuacamoleSessionClosedException extends GuacamoleUpstreamException {
+
+ /**
+ * Creates a new GuacamoleSessionClosedException with the given message and
+ * cause.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleSessionClosedException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Creates a new GuacamoleSessionClosedException with the given message.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ */
+ public GuacamoleSessionClosedException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a new GuacamoleSessionClosedException with the given cause.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleSessionClosedException(Throwable cause) {
+ super(cause);
+ }
+
+ @Override
+ public GuacamoleStatus getStatus() {
+ return GuacamoleStatus.SESSION_CLOSED;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/bfc2f2e7/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionConflictException.java
----------------------------------------------------------------------
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionConflictException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionConflictException.java
new file mode 100644
index 0000000..8fa3875
--- /dev/null
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionConflictException.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole;
+
+import org.apache.guacamole.protocol.GuacamoleStatus;
+
+/**
+ * An exception which indicates that a session within an upstream server (such
+ * as the remote desktop) has ended because it conflicted with another session.
+ */
+public class GuacamoleSessionConflictException extends GuacamoleUpstreamException {
+
+ /**
+ * Creates a new GuacamoleSessionConflictException with the given message
+ * and cause.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleSessionConflictException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Creates a new GuacamoleSessionConflictException with the given message.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ */
+ public GuacamoleSessionConflictException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a new GuacamoleSessionConflictException with the given cause.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleSessionConflictException(Throwable cause) {
+ super(cause);
+ }
+
+ @Override
+ public GuacamoleStatus getStatus() {
+ return GuacamoleStatus.SESSION_CONFLICT;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/bfc2f2e7/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionTimeoutException.java
----------------------------------------------------------------------
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionTimeoutException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionTimeoutException.java
new file mode 100644
index 0000000..7e33554
--- /dev/null
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSessionTimeoutException.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole;
+
+import org.apache.guacamole.protocol.GuacamoleStatus;
+
+/**
+ * An exception which indicates that a session within an upstream server (such
+ * as the remote desktop) has ended because it appeared to be inactive.
+ */
+public class GuacamoleSessionTimeoutException extends GuacamoleUpstreamException {
+
+ /**
+ * Creates a new GuacamoleSessionTimeoutException with the given message
+ * and cause.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleSessionTimeoutException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Creates a new GuacamoleSessionTimeoutException with the given message.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ */
+ public GuacamoleSessionTimeoutException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a new GuacamoleSessionTimeoutException with the given cause.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleSessionTimeoutException(Throwable cause) {
+ super(cause);
+ }
+
+ @Override
+ public GuacamoleStatus getStatus() {
+ return GuacamoleStatus.SESSION_TIMEOUT;
+ }
+
+}
[3/4] incubator-guacamole-client git commit: GUACAMOLE-208: Define
exceptions for the new UPSTREAM_NOT_FOUND and UPSTREAM_UNAVAILABLE status
codes.
Posted by jm...@apache.org.
GUACAMOLE-208: Define exceptions for the new UPSTREAM_NOT_FOUND and UPSTREAM_UNAVAILABLE 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/82e9967a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/82e9967a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/82e9967a
Branch: refs/heads/master
Commit: 82e9967a132c4616246aefa323bcdf75eb5884c2
Parents: e8f4cd5
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Apr 16 20:52:09 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Apr 16 23:13:03 2017 -0700
----------------------------------------------------------------------
.../GuacamoleUpstreamNotFoundException.java | 69 +++++++++++++++++++
.../GuacamoleUpstreamUnavailableException.java | 71 ++++++++++++++++++++
2 files changed, 140 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/82e9967a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamNotFoundException.java
----------------------------------------------------------------------
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamNotFoundException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamNotFoundException.java
new file mode 100644
index 0000000..2f7699b
--- /dev/null
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamNotFoundException.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole;
+
+import org.apache.guacamole.protocol.GuacamoleStatus;
+
+/**
+ * An exception which indicates that an upstream server (such as the remote
+ * desktop) does not appear to exist.
+ */
+public class GuacamoleUpstreamNotFoundException extends GuacamoleUpstreamException {
+
+ /**
+ * Creates a new GuacamoleUpstreamNotFoundException with the given message
+ * and cause.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleUpstreamNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Creates a new GuacamoleUpstreamNotFoundException with the given message.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ */
+ public GuacamoleUpstreamNotFoundException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a new GuacamoleUpstreamNotFoundException with the given cause.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleUpstreamNotFoundException(Throwable cause) {
+ super(cause);
+ }
+
+ @Override
+ public GuacamoleStatus getStatus() {
+ return GuacamoleStatus.UPSTREAM_NOT_FOUND;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/82e9967a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamUnavailableException.java
----------------------------------------------------------------------
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamUnavailableException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamUnavailableException.java
new file mode 100644
index 0000000..7d62083
--- /dev/null
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamUnavailableException.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.guacamole;
+
+import org.apache.guacamole.protocol.GuacamoleStatus;
+
+/**
+ * An exception which indicates that an upstream server (such as the remote
+ * desktop) is not available to service the request.
+ */
+public class GuacamoleUpstreamUnavailableException extends GuacamoleUpstreamException {
+
+ /**
+ * Creates a new GuacamoleUpstreamUnavailableException with the given
+ * message and cause.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleUpstreamUnavailableException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Creates a new GuacamoleUpstreamUnavailableException with the given
+ * message.
+ *
+ * @param message
+ * A human readable description of the exception that occurred.
+ */
+ public GuacamoleUpstreamUnavailableException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a new GuacamoleUpstreamUnavailableException with the given
+ * cause.
+ *
+ * @param cause
+ * The cause of this exception.
+ */
+ public GuacamoleUpstreamUnavailableException(Throwable cause) {
+ super(cause);
+ }
+
+ @Override
+ public GuacamoleStatus getStatus() {
+ return GuacamoleStatus.UPSTREAM_UNAVAILABLE;
+ }
+
+}
[4/4] incubator-guacamole-client git commit: GUACAMOLE-208: Merge new
exception classes.
Posted by jm...@apache.org.
GUACAMOLE-208: Merge new exception classes.
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/66dc1e6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/66dc1e6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/66dc1e6a
Branch: refs/heads/master
Commit: 66dc1e6aff5b76e6111145a31131a4c2af633b94
Parents: e8f4cd5 32610e9
Author: James Muehlner <ja...@guac-dev.org>
Authored: Thu Apr 20 21:05:33 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Thu Apr 20 21:05:33 2017 -0700
----------------------------------------------------------------------
.../GuacamoleResourceClosedException.java | 69 +++++++++++++++++++
.../GuacamoleSessionClosedException.java | 69 +++++++++++++++++++
.../GuacamoleSessionConflictException.java | 69 +++++++++++++++++++
.../GuacamoleSessionTimeoutException.java | 69 +++++++++++++++++++
.../GuacamoleUpstreamNotFoundException.java | 69 +++++++++++++++++++
.../GuacamoleUpstreamUnavailableException.java | 71 ++++++++++++++++++++
6 files changed, 416 insertions(+)
----------------------------------------------------------------------