You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/10/05 19:14:06 UTC
[1/3] guacamole-client git commit: GUACAMOLE-96: Add protected
convenience method for retrieving delegate object.
Repository: guacamole-client
Updated Branches:
refs/heads/master 9d485ffcf -> 01709fb26
GUACAMOLE-96: Add protected convenience method for retrieving delegate object.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/11c1d8c9
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/11c1d8c9
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/11c1d8c9
Branch: refs/heads/master
Commit: 11c1d8c97e4d0134da1953e57efcf55138157ba9
Parents: 7fcb506
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Oct 4 20:02:00 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Oct 5 10:36:47 2018 -0700
----------------------------------------------------------------------
.../org/apache/guacamole/auth/totp/user/TOTPUser.java | 8 +-------
.../apache/guacamole/net/auth/DelegatingConnection.java | 10 ++++++++++
.../guacamole/net/auth/DelegatingConnectionGroup.java | 11 +++++++++++
.../apache/guacamole/net/auth/DelegatingDirectory.java | 10 ++++++++++
.../guacamole/net/auth/DelegatingSharingProfile.java | 11 +++++++++++
.../org/apache/guacamole/net/auth/DelegatingUser.java | 10 ++++++++++
.../apache/guacamole/net/auth/DelegatingUserContext.java | 11 +++++++++++
.../apache/guacamole/net/auth/DelegatingUserGroup.java | 10 ++++++++++
8 files changed, 74 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/TOTPUser.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/TOTPUser.java b/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/TOTPUser.java
index 4199d43..5a9e4b8 100644
--- a/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/TOTPUser.java
+++ b/extensions/guacamole-auth-totp/src/main/java/org/apache/guacamole/auth/totp/user/TOTPUser.java
@@ -42,11 +42,6 @@ public class TOTPUser extends DelegatingUser {
public static final String TOTP_KEY_CONFIRMED_ATTRIBUTE_NAME = "guac-totp-key-confirmed";
/**
- * The User object wrapped by this TOTPUser.
- */
- private final User undecorated;
-
- /**
* Wraps the given User object, hiding and blocking access to the core
* attributes used by TOTP.
*
@@ -55,7 +50,6 @@ public class TOTPUser extends DelegatingUser {
*/
public TOTPUser(User user) {
super(user);
- this.undecorated = user;
}
/**
@@ -65,7 +59,7 @@ public class TOTPUser extends DelegatingUser {
* The wrapped User object.
*/
public User getUndecorated() {
- return undecorated;
+ return getDelegateUser();
}
@Override
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnection.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnection.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnection.java
index c5e9a1f..fa1ab78 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnection.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnection.java
@@ -50,6 +50,16 @@ public class DelegatingConnection implements Connection {
this.connection = connection;
}
+ /**
+ * Returns the underlying Connection wrapped by this DelegatingConnection.
+ *
+ * @return
+ * The Connection wrapped by this DelegatingConnection.
+ */
+ protected Connection getDelegateConnection() {
+ return connection;
+ }
+
@Override
public String getIdentifier() {
return connection.getIdentifier();
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnectionGroup.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnectionGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnectionGroup.java
index 9f71ebb..db647d6 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnectionGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingConnectionGroup.java
@@ -47,6 +47,17 @@ public class DelegatingConnectionGroup implements ConnectionGroup {
this.connectionGroup = connectionGroup;
}
+ /**
+ * Returns the underlying ConnectionGroup wrapped by this
+ * DelegatingConnectionGroup.
+ *
+ * @return
+ * The ConnectionGroup wrapped by this DelegatingConnectionGroup.
+ */
+ protected ConnectionGroup getDelegateConnectionGroup() {
+ return connectionGroup;
+ }
+
@Override
public String getIdentifier() {
return connectionGroup.getIdentifier();
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingDirectory.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingDirectory.java
index f1bf274..0a9046c 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingDirectory.java
@@ -49,6 +49,16 @@ public class DelegatingDirectory<ObjectType extends Identifiable>
this.directory = directory;
}
+ /**
+ * Returns the underlying Directory wrapped by this DelegatingDirectory.
+ *
+ * @return
+ * The Directory wrapped by this DelegatingDirectory.
+ */
+ protected Directory<ObjectType> getDelegateDirectory() {
+ return directory;
+ }
+
@Override
public ObjectType get(String identifier) throws GuacamoleException {
return directory.get(identifier);
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingSharingProfile.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingSharingProfile.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingSharingProfile.java
index 576e882..c16bbeb 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingSharingProfile.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingSharingProfile.java
@@ -43,6 +43,17 @@ public class DelegatingSharingProfile implements SharingProfile {
this.sharingProfile = sharingProfile;
}
+ /**
+ * Returns the underlying SharingProfile wrapped by this
+ * DelegatingSharingProfile.
+ *
+ * @return
+ * The SharingProfile wrapped by this DelegatingSharingProfile.
+ */
+ protected SharingProfile getDelegateSharingProfile() {
+ return sharingProfile;
+ }
+
@Override
public String getIdentifier() {
return sharingProfile.getIdentifier();
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUser.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUser.java
index 92873c4..add7be6 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUser.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUser.java
@@ -48,6 +48,16 @@ public class DelegatingUser implements User {
this.user = user;
}
+ /**
+ * Returns the underlying User wrapped by this DelegatingUser.
+ *
+ * @return
+ * The User wrapped by this DelegatingUser.
+ */
+ protected User getDelegateUser() {
+ return user;
+ }
+
@Override
public String getIdentifier() {
return user.getIdentifier();
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserContext.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserContext.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserContext.java
index 00788f8..9db6adb 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserContext.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserContext.java
@@ -45,6 +45,17 @@ public class DelegatingUserContext implements UserContext {
this.userContext = userContext;
}
+ /**
+ * Returns the underlying UserContext wrapped by this
+ * DelegatingUserContext.
+ *
+ * @return
+ * The UserContext wrapped by this DelegatingUserContext.
+ */
+ protected UserContext getDelegateUserContext() {
+ return userContext;
+ }
+
@Override
public User self() {
return userContext.self();
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/11c1d8c9/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserGroup.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserGroup.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserGroup.java
index 5093a21..22aa39a 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserGroup.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUserGroup.java
@@ -46,6 +46,16 @@ public class DelegatingUserGroup implements UserGroup {
this.userGroup = userGroup;
}
+ /**
+ * Returns the underlying UserGroup wrapped by this DelegatingUserGroup.
+ *
+ * @return
+ * The UserGroup wrapped by this DelegatingUserGroup.
+ */
+ protected UserGroup getDelegateUserGroupGroup() {
+ return userGroup;
+ }
+
@Override
public String getIdentifier() {
return userGroup.getIdentifier();
[3/3] guacamole-client git commit: Merge 1.0.0 changes back to master.
Posted by vn...@apache.org.
Merge 1.0.0 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/01709fb2
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/01709fb2
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/01709fb2
Branch: refs/heads/master
Commit: 01709fb26bce02d49a9034257b68c9c70441c7dc
Parents: 9d485ff 2507167
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Oct 5 15:13:36 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Oct 5 15:13:36 2018 -0400
----------------------------------------------------------------------
.../org/apache/guacamole/auth/totp/user/TOTPUser.java | 8 +-------
.../apache/guacamole/net/auth/DelegatingConnection.java | 10 ++++++++++
.../guacamole/net/auth/DelegatingConnectionGroup.java | 11 +++++++++++
.../apache/guacamole/net/auth/DelegatingDirectory.java | 10 ++++++++++
.../guacamole/net/auth/DelegatingSharingProfile.java | 11 +++++++++++
.../org/apache/guacamole/net/auth/DelegatingUser.java | 10 ++++++++++
.../apache/guacamole/net/auth/DelegatingUserContext.java | 11 +++++++++++
.../apache/guacamole/net/auth/DelegatingUserGroup.java | 10 ++++++++++
8 files changed, 74 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/3] guacamole-client git commit: GUACAMOLE-96: Merge add protected
convenience method for retrieving delegate object.
Posted by vn...@apache.org.
GUACAMOLE-96: Merge add protected convenience method for retrieving delegate object.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/25071673
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/25071673
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/25071673
Branch: refs/heads/master
Commit: 25071673dbd499999f6722f9c31778a5c4e86ab7
Parents: 7fcb506 11c1d8c
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Oct 5 14:40:22 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Oct 5 14:40:22 2018 -0400
----------------------------------------------------------------------
.../org/apache/guacamole/auth/totp/user/TOTPUser.java | 8 +-------
.../apache/guacamole/net/auth/DelegatingConnection.java | 10 ++++++++++
.../guacamole/net/auth/DelegatingConnectionGroup.java | 11 +++++++++++
.../apache/guacamole/net/auth/DelegatingDirectory.java | 10 ++++++++++
.../guacamole/net/auth/DelegatingSharingProfile.java | 11 +++++++++++
.../org/apache/guacamole/net/auth/DelegatingUser.java | 10 ++++++++++
.../apache/guacamole/net/auth/DelegatingUserContext.java | 11 +++++++++++
.../apache/guacamole/net/auth/DelegatingUserGroup.java | 10 ++++++++++
8 files changed, 74 insertions(+), 7 deletions(-)
----------------------------------------------------------------------