safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1298: Migrate to centralized declarations of common dependencies.

Browse Source
This commit is contained in:
Michael Jumper
2021-03-25 19:58:53 -07:00
parent d4e3d8c98f
commit 53fe6e34f8
35 changed files with 306 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
guacamole-ext/pom.xml
View File

@@ -30,6 +30,13 @@
<name>guacamole-ext</name>
<url>http://guacamole.apache.org/</url>
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId>
<version>1.3.0</version>
<relativePath>../</relativePath>
</parent>
<description>
The Java API for extending the main Guacamole web application. This
is not needed for authoring a new Guacamole-based web application.
@@ -151,14 +158,6 @@
<scope>provided</scope>
</dependency>
<!-- JAXB -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.2</version>
<scope>provided</scope>
</dependency>
<!-- Guacamole Java API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
@@ -175,11 +174,16 @@
<scope>test</scope>
</dependency>
<!-- Guava Base Libraries -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<!-- Jackson for JSON support -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.2</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>

2
guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java
View File

@@ -19,6 +19,7 @@
package org.apache.guacamole.environment;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
@@ -27,7 +28,6 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import org.codehaus.jackson.map.ObjectMapper;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.net.auth.GuacamoleProxyConfiguration;

5
guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java
View File

@@ -19,8 +19,9 @@
package org.apache.guacamole.form;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import java.util.Collection;
import org.codehaus.jackson.map.annotate.JsonSerialize;
/**
* Represents an arbitrary field, such as an HTTP parameter, the parameter of a
@@ -30,7 +31,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
* either through the web application itself (see FormService.js) or through
* extensions.
*/
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonInclude(value=Include.NON_NULL)
public class Field {
/**

5
guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java
View File

@@ -19,12 +19,13 @@
package org.apache.guacamole.form;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
/**
* Describes an available legal value for an enumerated field.
*/
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonInclude(value=Include.NON_NULL)
public class FieldOption {
/**

5
guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java
View File

@@ -19,14 +19,15 @@
package org.apache.guacamole.form;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import java.util.ArrayList;
import java.util.Collection;
import org.codehaus.jackson.map.annotate.JsonSerialize;
/**
* Information which describes logical set of fields.
*/
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
@JsonInclude(value=Include.NON_NULL)
public class Form {
/**

4
guacamole-ext/src/main/java/org/apache/guacamole/properties/ByteArrayProperty.java
View File

@@ -19,7 +19,7 @@
package org.apache.guacamole.properties;
import javax.xml.bind.DatatypeConverter;
import com.google.common.io.BaseEncoding;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
@@ -39,7 +39,7 @@ public abstract class ByteArrayProperty implements GuacamoleProperty<byte[]> {
// Return value parsed from hex
try {
return DatatypeConverter.parseHexBinary(value);
return BaseEncoding.base16().decode(value);
}
// Fail parse if hex invalid