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

GUACAMOLE-1218: Refactor org.glyptodon.* packages to org.apache.*

Browse Source
This commit is contained in:
Michael Jumper
2020-11-20 13:46:49 -08:00
parent cec53a24e6
commit 90f1ce9bc1
17 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/AuthenticationProviderService.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/AuthenticationProviderService.java
View File

@@ -20,18 +20,18 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.json.user.AuthenticatedUser;
import org.apache.guacamole.auth.json.user.UserContext;
import org.apache.guacamole.auth.json.user.UserData;
import org.apache.guacamole.auth.json.user.UserDataService;
import org.apache.guacamole.net.auth.Credentials;
import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
import org.glyptodon.guacamole.auth.json.user.AuthenticatedUser;
import org.glyptodon.guacamole.auth.json.user.UserContext;
import org.glyptodon.guacamole.auth.json.user.UserData;
import org.glyptodon.guacamole.auth.json.user.UserDataService;
/**
* Service providing convenience functions for the JSONAuthenticationProvider.

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/ByteArrayProperty.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ByteArrayProperty.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import javax.xml.bind.DatatypeConverter;
import org.apache.guacamole.GuacamoleException;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/ConfigurationService.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ConfigurationService.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import com.google.inject.Inject;
import java.util.Collection;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/CryptoService.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/CryptoService.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/JSONAuthenticationProvider.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProvider.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import com.google.inject.Guice;

6
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/JSONAuthenticationProviderModule.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/JSONAuthenticationProviderModule.java
View File

@@ -20,15 +20,15 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import com.google.inject.AbstractModule;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.json.connection.ConnectionService;
import org.apache.guacamole.auth.json.user.UserDataService;
import org.apache.guacamole.environment.Environment;
import org.apache.guacamole.environment.LocalEnvironment;
import org.apache.guacamole.net.auth.AuthenticationProvider;
import org.glyptodon.guacamole.auth.json.connection.ConnectionService;
import org.glyptodon.guacamole.auth.json.user.UserDataService;
/**
* Guice module which configures injections specific to the JSON authentication

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/RequestValidationService.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/RequestValidationService.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import com.google.inject.Inject;
import java.util.ArrayList;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/StringListProperty.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/StringListProperty.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json;
package org.apache.guacamole.auth.json;
import java.util.Arrays;
import java.util.List;

4
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/connection/ConnectionService.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/connection/ConnectionService.java
View File

@@ -46,7 +46,7 @@
* under the License.
*/
package org.glyptodon.guacamole.auth.json.connection;
package org.apache.guacamole.auth.json.connection;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -58,6 +58,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleResourceNotFoundException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.auth.json.user.UserData;
import org.apache.guacamole.environment.Environment;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
@@ -70,7 +71,6 @@ import org.apache.guacamole.net.auth.GuacamoleProxyConfiguration;
import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
import org.apache.guacamole.protocol.GuacamoleClientInformation;
import org.apache.guacamole.protocol.GuacamoleConfiguration;
import org.glyptodon.guacamole.auth.json.user.UserData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/user/AuthenticatedUser.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/AuthenticatedUser.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json.user;
package org.apache.guacamole.auth.json.user;
import com.google.inject.Inject;
import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/user/UserContext.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserContext.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json.user;
package org.apache.guacamole.auth.json.user;
import com.google.inject.Inject;
import org.apache.guacamole.net.auth.AbstractUserContext;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/user/UserData.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserData.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json.user;
package org.apache.guacamole.auth.json.user;
import java.util.Collections;
import java.util.Map;

2
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/user/UserDataBlacklist.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataBlacklist.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json.user;
package org.apache.guacamole.auth.json.user;
import java.util.Iterator;
import java.util.Map;

4
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/user/UserDataConnection.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataConnection.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json.user;
package org.apache.guacamole.auth.json.user;
import com.google.inject.Inject;
import java.util.Collections;
@@ -30,12 +30,12 @@ import java.util.Map;
import java.util.Set;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleSecurityException;
import org.apache.guacamole.auth.json.connection.ConnectionService;
import org.apache.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.net.auth.Connection;
import org.apache.guacamole.net.auth.ConnectionRecord;
import org.apache.guacamole.protocol.GuacamoleClientInformation;
import org.apache.guacamole.protocol.GuacamoleConfiguration;
import org.glyptodon.guacamole.auth.json.connection.ConnectionService;
/**
* Connection implementation which automatically manages related UserData if

8
extensions/guacamole-auth-json/src/main/java/org/glyptodon/guacamole/auth/json/user/UserDataService.java → extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataService.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.auth.json.user;
package org.apache.guacamole.auth.json.user;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -35,6 +35,9 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.xml.bind.DatatypeConverter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.json.ConfigurationService;
import org.apache.guacamole.auth.json.CryptoService;
import org.apache.guacamole.auth.json.RequestValidationService;
import org.apache.guacamole.net.auth.Connection;
import org.apache.guacamole.net.auth.Credentials;
import org.apache.guacamole.net.auth.Directory;
@@ -44,9 +47,6 @@ import org.apache.guacamole.net.auth.simple.SimpleDirectory;
import org.apache.guacamole.net.auth.simple.SimpleObjectPermissionSet;
import org.apache.guacamole.net.auth.simple.SimpleUser;
import org.codehaus.jackson.map.ObjectMapper;
import org.glyptodon.guacamole.auth.json.ConfigurationService;
import org.glyptodon.guacamole.auth.json.CryptoService;
import org.glyptodon.guacamole.auth.json.RequestValidationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
extensions/guacamole-auth-json/src/main/resources/guac-manifest.json
View File

@@ -6,7 +6,7 @@
"namespace" : "guac-json",
"authProviders" : [
"org.glyptodon.guacamole.auth.json.JSONAuthenticationProvider"
"org.apache.guacamole.auth.json.JSONAuthenticationProvider"
],
"translations" : [