From 29982e3a855fcec2fae4c0d37e2e0ad71b1ca726 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Tue, 4 Dec 2018 19:16:57 -0500 Subject: [PATCH] GUACAMOLE-526: Clean up unused code and minor errors. --- .../apache/guacamole/auth/cas/conf/ConfigurationService.java | 1 - .../guacamole/auth/cas/conf/PrivateKeyGuacamoleProperty.java | 5 ----- .../guacamole-auth-cas/src/main/resources/casModule.js | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-) 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 dee9c4d69..e0016ad75 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; 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 455f17729..d1c16859d 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. diff --git a/extensions/guacamole-auth-cas/src/main/resources/casModule.js b/extensions/guacamole-auth-cas/src/main/resources/casModule.js index bd789dde4..c40e6b26c 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