GUAC-340: Add Environment and LocalEnvironment, collectively replacing GuacamoleHome and GuacamoleProperties. Mark GuacamoleHome and GuacamoleProperties as deprecated. Remove use of deprecated classes within guacamole-ext.

This commit is contained in:
Michael Jumper
2014-11-23 14:01:05 -08:00
parent 534f4f45c1
commit ff286264e4
5 changed files with 331 additions and 4 deletions

View File

@@ -23,14 +23,27 @@
package org.glyptodon.guacamole.properties;
import java.io.File;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Abstract representation of the Guacamole configuration directory.
*
* @deprecated
* @author Michael Jumper
*/
public class GuacamoleHome {
/**
* Logger for this class.
*/
private static final Logger logger = LoggerFactory.getLogger(GuacamoleHome.class);
static {
// Warn about deprecation
logger.warn("GuacamoleHome is deprecated. Please use Environment instead.");
}
/**
* GuacamoleHome is a utility class and cannot be instantiated.
*/

View File

@@ -29,6 +29,8 @@ import java.io.InputStream;
import java.util.Properties;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Simple utility class for reading properties from the guacamole.properties
@@ -39,10 +41,21 @@ import org.glyptodon.guacamole.GuacamoleServerException;
* If none of those locations are possible, guacamole.properties will also
* be read from the root of the classpath.
*
* @deprecated
* @author Michael Jumper
*/
public class GuacamoleProperties {
/**
* Logger for this class.
*/
private static final Logger logger = LoggerFactory.getLogger(GuacamoleProperties.class);
static {
// Warn about deprecation
logger.warn("GuacamoleProperties is deprecated. Please use Environment instead.");
}
/**
* GuacamoleProperties is a utility class and cannot be instantiated.
*/