From f2ce41205132ac861d0767b2d54e8e5aae25d89d Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 20 Nov 2020 14:05:20 -0800 Subject: [PATCH] GUACAMOLE-1218: Refactor guacamole-auth-json's ByteArrayProperty into guacamole-ext. --- .../org/apache/guacamole/auth/json/ConfigurationService.java | 1 + .../org/apache/guacamole/properties}/ByteArrayProperty.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) rename {extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json => guacamole-ext/src/main/java/org/apache/guacamole/properties}/ByteArrayProperty.java (94%) diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ConfigurationService.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ConfigurationService.java index c52aa9010..769a3afde 100644 --- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ConfigurationService.java +++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ConfigurationService.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.Collections; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; +import org.apache.guacamole.properties.ByteArrayProperty; /** * Service for retrieving configuration information regarding the JSON diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ByteArrayProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/ByteArrayProperty.java similarity index 94% rename from extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ByteArrayProperty.java rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/ByteArrayProperty.java index 4d685b08e..eaa012b16 100644 --- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ByteArrayProperty.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/ByteArrayProperty.java @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.guacamole.auth.json; +package org.apache.guacamole.properties; import javax.xml.bind.DatatypeConverter; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleServerException; -import org.apache.guacamole.properties.GuacamoleProperty; /** * A GuacamoleProperty whose value is a byte array. The bytes of the byte array