From 382e347a3c9728a9fb467e1edc31a1e5e4d1d5a9 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 20 Nov 2020 14:06:35 -0800 Subject: [PATCH] GUACAMOLE-1218: Refactor guacamole-auth-json's StringListProperty into guacamole-ext. --- .../org/apache/guacamole/auth/json/ConfigurationService.java | 1 + .../org/apache/guacamole/properties}/StringListProperty.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}/StringListProperty.java (95%) 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 769a3afde..1483f6fcb 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 @@ -25,6 +25,7 @@ import java.util.Collections; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; import org.apache.guacamole.properties.ByteArrayProperty; +import org.apache.guacamole.properties.StringListProperty; /** * Service for retrieving configuration information regarding the JSON diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/StringListProperty.java b/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringListProperty.java similarity index 95% rename from extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/StringListProperty.java rename to guacamole-ext/src/main/java/org/apache/guacamole/properties/StringListProperty.java index 94d24c158..0bb81423c 100644 --- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/StringListProperty.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/properties/StringListProperty.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.guacamole.auth.json; +package org.apache.guacamole.properties; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; import org.apache.guacamole.GuacamoleException; -import org.apache.guacamole.properties.GuacamoleProperty; /** * A GuacamoleProperty whose value is a List of Strings. The string value