You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/12/05 22:42:27 UTC
[2/4] guacamole-client git commit: GUACAMOLE-526: Clean up unused
code and minor errors.
GUACAMOLE-526: Clean up unused code and minor errors.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/29982e3a
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/29982e3a
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/29982e3a
Branch: refs/heads/master
Commit: 29982e3a855fcec2fae4c0d37e2e0ad71b1ca726
Parents: df8c07c
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Dec 4 19:16:57 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Dec 4 19:28:18 2018 -0500
----------------------------------------------------------------------
.../apache/guacamole/auth/cas/conf/ConfigurationService.java | 1 -
.../guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java | 5 -----
extensions/guacamole-auth-cas/src/main/resources/casModule.js | 3 +--
3 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/29982e3a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java
index dee9c4d..e0016ad 100644
--- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java
+++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/ConfigurationService.java
@@ -20,7 +20,6 @@
package org.apache.guacamole.auth.cas.conf;
import com.google.inject.Inject;
-import java.io.File;
import java.security.PrivateKey;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.environment.Environment;
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/29982e3a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java
index 455f177..d1c1685 100644
--- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java
+++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java
@@ -23,10 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
-import java.lang.IllegalArgumentException;
-import java.security.InvalidKeyException;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
@@ -35,8 +32,6 @@ import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import org.apache.guacamole.properties.GuacamoleProperty;
import org.apache.guacamole.GuacamoleServerException;
-import org.apache.guacamole.environment.Environment;
-import org.apache.guacamole.environment.LocalEnvironment;
/**
* A GuacamoleProperty whose value is derived from a private key file.
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/29982e3a/extensions/guacamole-auth-cas/src/main/resources/casModule.js
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/casModule.js b/extensions/guacamole-auth-cas/src/main/resources/casModule.js
index bd789dd..c40e6b2 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/casModule.js
+++ b/extensions/guacamole-auth-cas/src/main/resources/casModule.js
@@ -21,8 +21,7 @@
* Module which provides handling for CAS authentication.
*/
angular.module('guacCAS', [
- 'form',
- 'ngRoute',
+ 'form'
]);
// Ensure the CAS module is loaded along with the rest of the app