From 648a6c96f02973e8792af10328f771aeabd1a024 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 22 Mar 2016 14:35:36 -0700 Subject: [PATCH] GUACAMOLE-1: Remove useless .net.basic subpackage, now that everything is being renamed. --- .../BasicGuacamoleTunnelServlet.java | 2 +- .../BasicServletContextListener.java | 12 ++++---- .../{net/basic => }/ClipboardState.java | 2 +- .../{net/basic => }/EnvironmentModule.java | 2 +- .../{net/basic => }/GuacamoleClassLoader.java | 4 +-- .../{net/basic => }/GuacamoleSession.java | 2 +- .../{net/basic => }/HTTPTunnelRequest.java | 2 +- .../{net/basic => }/TunnelLoader.java | 2 +- .../{net/basic => }/TunnelModule.java | 10 +++---- .../{net/basic => }/TunnelRequest.java | 2 +- .../{net/basic => }/TunnelRequestService.java | 6 ++-- .../{net/basic => }/auth/Authorization.java | 2 +- .../{net/basic => }/auth/UserMapping.java | 2 +- .../basic}/AuthorizeTagHandler.java | 6 ++-- .../BasicFileAuthenticationProvider.java | 8 +++--- .../basic}/ConnectionTagHandler.java | 4 +-- .../basic}/ParamTagHandler.java | 2 +- .../basic}/ProtocolTagHandler.java | 2 +- .../basic}/UserMappingTagHandler.java | 4 +-- .../basic}/package-info.java | 2 +- .../{net/basic => }/auth/package-info.java | 2 +- .../AuthenticationProviderFacade.java | 2 +- .../extension/DirectoryClassLoader.java | 2 +- .../{net/basic => }/extension/Extension.java | 6 ++-- .../extension/ExtensionManifest.java | 2 +- .../basic => }/extension/ExtensionModule.java | 14 +++++----- .../extension/LanguageResourceService.java | 10 +++---- .../extension/PatchResourceService.java | 4 +-- .../basic => }/extension/package-info.java | 2 +- .../{net/basic => }/log/LogModule.java | 2 +- .../{net/basic => }/package-info.java | 2 +- .../AuthenticationProviderProperty.java | 4 +-- .../properties/BasicGuacamoleProperties.java | 2 +- .../properties/StringSetProperty.java | 2 +- .../basic => }/properties/package-info.java | 2 +- .../basic => }/resource/AbstractResource.java | 2 +- .../resource/ByteArrayResource.java | 2 +- .../resource/ClassPathResource.java | 2 +- .../{net/basic => }/resource/Resource.java | 2 +- .../basic => }/resource/ResourceServlet.java | 2 +- .../basic => }/resource/SequenceResource.java | 2 +- .../resource/WebApplicationResource.java | 2 +- .../basic => }/resource/package-info.java | 2 +- .../{net/basic => }/rest/APIError.java | 2 +- .../{net/basic => }/rest/APIException.java | 2 +- .../{net/basic => }/rest/APIPatch.java | 2 +- .../{net/basic => }/rest/APIRequest.java | 2 +- .../rest/ObjectRetrievalService.java | 6 ++-- .../guacamole/{net/basic => }/rest/PATCH.java | 2 +- .../basic => }/rest/RESTExceptionWrapper.java | 4 +-- .../basic => }/rest/RESTMethodMatcher.java | 2 +- .../basic => }/rest/RESTServiceModule.java | 28 +++++++++---------- .../activeconnection/APIActiveConnection.java | 2 +- .../ActiveConnectionRESTService.java | 12 ++++---- .../rest/auth/APIAuthenticationResponse.java | 2 +- .../rest/auth/APIAuthenticationResult.java | 2 +- .../rest/auth/AuthTokenGenerator.java | 2 +- .../rest/auth/AuthenticationService.java | 4 +-- .../rest/auth/BasicTokenSessionMap.java | 6 ++-- .../auth/SecureRandomAuthTokenGenerator.java | 2 +- .../rest/auth/TokenRESTService.java | 6 ++-- .../basic => }/rest/auth/TokenSessionMap.java | 4 +-- .../basic => }/rest/auth/package-info.java | 2 +- .../rest/connection/APIConnection.java | 2 +- .../rest/connection/APIConnectionWrapper.java | 2 +- .../connection/ConnectionRESTService.java | 10 +++---- .../rest/connection/package-info.java | 2 +- .../connectiongroup/APIConnectionGroup.java | 4 +-- .../APIConnectionGroupWrapper.java | 2 +- .../ConnectionGroupRESTService.java | 8 +++--- .../connectiongroup/ConnectionGroupTree.java | 4 +-- .../rest/connectiongroup/package-info.java | 2 +- .../rest/history/APIConnectionRecord.java | 2 +- .../APIConnectionRecordSortPredicate.java | 6 ++-- .../rest/history/HistoryRESTService.java | 8 +++--- .../basic => }/rest/history/package-info.java | 2 +- .../rest/language/LanguageRESTService.java | 4 +-- .../rest/language/package-info.java | 2 +- .../{net/basic => }/rest/package-info.java | 2 +- .../rest/patch/PatchRESTService.java | 6 ++-- .../basic => }/rest/patch/package-info.java | 2 +- .../rest/permission/APIPermissionSet.java | 2 +- .../rest/permission/package-info.java | 2 +- .../rest/schema/SchemaRESTService.java | 8 +++--- .../basic => }/rest/schema/package-info.java | 2 +- .../{net/basic => }/rest/user/APIUser.java | 2 +- .../rest/user/APIUserPasswordUpdate.java | 2 +- .../basic => }/rest/user/APIUserWrapper.java | 2 +- .../rest/user/PermissionSetPatch.java | 2 +- .../basic => }/rest/user/UserRESTService.java | 18 ++++++------ .../basic => }/rest/user/package-info.java | 2 +- ...BasicGuacamoleWebSocketTunnelEndpoint.java | 6 ++-- .../websocket/WebSocketTunnelModule.java | 6 ++-- .../websocket/WebSocketTunnelRequest.java | 4 +-- .../BasicGuacamoleWebSocketTunnelServlet.java | 6 ++-- .../GuacamoleWebSocketTunnelServlet.java | 6 ++-- .../jetty8/WebSocketTunnelModule.java | 6 ++-- .../websocket/jetty8/package-info.java | 2 +- .../BasicGuacamoleWebSocketCreator.java | 4 +-- ...BasicGuacamoleWebSocketTunnelListener.java | 4 +-- .../BasicGuacamoleWebSocketTunnelServlet.java | 4 +-- .../GuacamoleWebSocketTunnelListener.java | 2 +- .../jetty9/WebSocketTunnelModule.java | 6 ++-- .../jetty9/WebSocketTunnelRequest.java | 4 +-- .../websocket/jetty9/package-info.java | 2 +- .../basic => }/websocket/package-info.java | 2 +- .../BasicGuacamoleWebSocketTunnelServlet.java | 6 ++-- .../GuacamoleWebSocketTunnelServlet.java | 6 ++-- .../tomcat/WebSocketTunnelModule.java | 6 ++-- .../websocket/tomcat/package-info.java | 2 +- guacamole/src/main/webapp/WEB-INF/web.xml | 2 +- 111 files changed, 222 insertions(+), 222 deletions(-) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/BasicGuacamoleTunnelServlet.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/BasicServletContextListener.java (90%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/ClipboardState.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/EnvironmentModule.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/GuacamoleClassLoader.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/GuacamoleSession.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/HTTPTunnelRequest.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/TunnelLoader.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/TunnelModule.java (90%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/TunnelRequest.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/TunnelRequestService.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/auth/Authorization.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/auth/UserMapping.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic/xml/usermapping => auth/basic}/AuthorizeTagHandler.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net => auth}/basic/BasicFileAuthenticationProvider.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic/xml/usermapping => auth/basic}/ConnectionTagHandler.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic/xml/usermapping => auth/basic}/ParamTagHandler.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic/xml/usermapping => auth/basic}/ProtocolTagHandler.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic/xml/usermapping => auth/basic}/UserMappingTagHandler.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic/xml/usermapping => auth/basic}/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/auth/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/AuthenticationProviderFacade.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/DirectoryClassLoader.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/Extension.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/ExtensionManifest.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/ExtensionModule.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/LanguageResourceService.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/PatchResourceService.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/extension/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/log/LogModule.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/properties/AuthenticationProviderProperty.java (93%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/properties/BasicGuacamoleProperties.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/properties/StringSetProperty.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/properties/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/AbstractResource.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/ByteArrayResource.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/ClassPathResource.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/Resource.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/ResourceServlet.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/SequenceResource.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/WebApplicationResource.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/resource/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/APIError.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/APIException.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/APIPatch.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/APIRequest.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/ObjectRetrievalService.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/PATCH.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/RESTExceptionWrapper.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/RESTMethodMatcher.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/RESTServiceModule.java (78%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/activeconnection/APIActiveConnection.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/activeconnection/ActiveConnectionRESTService.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/APIAuthenticationResponse.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/APIAuthenticationResult.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/AuthTokenGenerator.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/AuthenticationService.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/BasicTokenSessionMap.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/SecureRandomAuthTokenGenerator.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/TokenRESTService.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/TokenSessionMap.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/auth/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connection/APIConnection.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connection/APIConnectionWrapper.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connection/ConnectionRESTService.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connection/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connectiongroup/APIConnectionGroup.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connectiongroup/APIConnectionGroupWrapper.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connectiongroup/ConnectionGroupRESTService.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connectiongroup/ConnectionGroupTree.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/connectiongroup/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/history/APIConnectionRecord.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/history/APIConnectionRecordSortPredicate.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/history/HistoryRESTService.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/history/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/language/LanguageRESTService.java (94%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/language/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/patch/PatchRESTService.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/patch/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/permission/APIPermissionSet.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/permission/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/schema/SchemaRESTService.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/schema/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/user/APIUser.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/user/APIUserPasswordUpdate.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/user/APIUserWrapper.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/user/PermissionSetPatch.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/user/UserRESTService.java (97%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/rest/user/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/WebSocketTunnelModule.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/WebSocketTunnelRequest.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java (91%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty8/WebSocketTunnelModule.java (90%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty8/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty9/BasicGuacamoleWebSocketCreator.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java (94%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty9/GuacamoleWebSocketTunnelListener.java (99%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty9/WebSocketTunnelModule.java (90%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty9/WebSocketTunnelRequest.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/jetty9/package-info.java (95%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/package-info.java (96%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java (91%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java (98%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/tomcat/WebSocketTunnelModule.java (90%) rename guacamole/src/main/java/org/apache/guacamole/{net/basic => }/websocket/tomcat/package-info.java (95%) diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicGuacamoleTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/BasicGuacamoleTunnelServlet.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/BasicGuacamoleTunnelServlet.java rename to guacamole/src/main/java/org/apache/guacamole/BasicGuacamoleTunnelServlet.java index d2bff1a31..7ebbd7fc2 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicGuacamoleTunnelServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/BasicGuacamoleTunnelServlet.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicServletContextListener.java b/guacamole/src/main/java/org/apache/guacamole/BasicServletContextListener.java similarity index 90% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/BasicServletContextListener.java rename to guacamole/src/main/java/org/apache/guacamole/BasicServletContextListener.java index 3bf6b9e96..96fab8578 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicServletContextListener.java +++ b/guacamole/src/main/java/org/apache/guacamole/BasicServletContextListener.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import com.google.inject.Guice; import com.google.inject.Injector; @@ -30,11 +30,11 @@ import javax.servlet.ServletContextEvent; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; import org.apache.guacamole.environment.LocalEnvironment; -import org.apache.guacamole.net.basic.extension.ExtensionModule; -import org.apache.guacamole.net.basic.log.LogModule; -import org.apache.guacamole.net.basic.rest.RESTServiceModule; -import org.apache.guacamole.net.basic.rest.auth.BasicTokenSessionMap; -import org.apache.guacamole.net.basic.rest.auth.TokenSessionMap; +import org.apache.guacamole.extension.ExtensionModule; +import org.apache.guacamole.log.LogModule; +import org.apache.guacamole.rest.RESTServiceModule; +import org.apache.guacamole.rest.auth.BasicTokenSessionMap; +import org.apache.guacamole.rest.auth.TokenSessionMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/ClipboardState.java b/guacamole/src/main/java/org/apache/guacamole/ClipboardState.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/ClipboardState.java rename to guacamole/src/main/java/org/apache/guacamole/ClipboardState.java index dae5d7498..bde6822b0 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/ClipboardState.java +++ b/guacamole/src/main/java/org/apache/guacamole/ClipboardState.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; /** * Provides central storage for a cross-connection clipboard state. This diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/EnvironmentModule.java b/guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/EnvironmentModule.java rename to guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java index 76559d101..c4a6115bd 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/EnvironmentModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/EnvironmentModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import com.google.inject.AbstractModule; import org.apache.guacamole.environment.Environment; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleClassLoader.java b/guacamole/src/main/java/org/apache/guacamole/GuacamoleClassLoader.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleClassLoader.java rename to guacamole/src/main/java/org/apache/guacamole/GuacamoleClassLoader.java index 236d366c1..f89b885d9 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleClassLoader.java +++ b/guacamole/src/main/java/org/apache/guacamole/GuacamoleClassLoader.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import java.io.File; import java.io.FilenameFilter; @@ -35,7 +35,7 @@ import java.util.Collection; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; import org.apache.guacamole.environment.LocalEnvironment; -import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties; +import org.apache.guacamole.properties.BasicGuacamoleProperties; /** * A ClassLoader implementation which finds classes within a configurable diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleSession.java b/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleSession.java rename to guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java index 6d9ffc3eb..5345528ea 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleSession.java +++ b/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import java.util.Collections; import java.util.List; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/HTTPTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/HTTPTunnelRequest.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/HTTPTunnelRequest.java rename to guacamole/src/main/java/org/apache/guacamole/HTTPTunnelRequest.java index da6bf22a1..9edc45a9b 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/HTTPTunnelRequest.java +++ b/guacamole/src/main/java/org/apache/guacamole/HTTPTunnelRequest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import java.util.ArrayList; import java.util.Arrays; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelLoader.java b/guacamole/src/main/java/org/apache/guacamole/TunnelLoader.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelLoader.java rename to guacamole/src/main/java/org/apache/guacamole/TunnelLoader.java index 960daff04..756c6dd49 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelLoader.java +++ b/guacamole/src/main/java/org/apache/guacamole/TunnelLoader.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import com.google.inject.Module; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/TunnelModule.java similarity index 90% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelModule.java rename to guacamole/src/main/java/org/apache/guacamole/TunnelModule.java index 11685176f..e7c105c04 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/TunnelModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import com.google.inject.servlet.ServletModule; import java.lang.reflect.InvocationTargetException; @@ -43,10 +43,10 @@ public class TunnelModule extends ServletModule { * Classnames of all implementation-specific WebSocket tunnel modules. */ private static final String[] WEBSOCKET_MODULES = { - "org.apache.guacamole.net.basic.websocket.WebSocketTunnelModule", - "org.apache.guacamole.net.basic.websocket.jetty8.WebSocketTunnelModule", - "org.apache.guacamole.net.basic.websocket.jetty9.WebSocketTunnelModule", - "org.apache.guacamole.net.basic.websocket.tomcat.WebSocketTunnelModule" + "org.apache.guacamole.websocket.WebSocketTunnelModule", + "org.apache.guacamole.websocket.jetty8.WebSocketTunnelModule", + "org.apache.guacamole.websocket.jetty9.WebSocketTunnelModule", + "org.apache.guacamole.websocket.tomcat.WebSocketTunnelModule" }; private boolean loadWebSocketModule(String classname) { diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/TunnelRequest.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequest.java rename to guacamole/src/main/java/org/apache/guacamole/TunnelRequest.java index 5866485a9..622e2f0c3 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequest.java +++ b/guacamole/src/main/java/org/apache/guacamole/TunnelRequest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import java.util.List; import org.apache.guacamole.GuacamoleClientException; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequestService.java b/guacamole/src/main/java/org/apache/guacamole/TunnelRequestService.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequestService.java rename to guacamole/src/main/java/org/apache/guacamole/TunnelRequestService.java index 128b8993c..d78fddeba 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequestService.java +++ b/guacamole/src/main/java/org/apache/guacamole/TunnelRequestService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,8 +34,8 @@ import org.apache.guacamole.net.auth.Connection; import org.apache.guacamole.net.auth.ConnectionGroup; import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.UserContext; -import org.apache.guacamole.net.basic.rest.ObjectRetrievalService; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; +import org.apache.guacamole.rest.ObjectRetrievalService; +import org.apache.guacamole.rest.auth.AuthenticationService; import org.apache.guacamole.protocol.GuacamoleClientInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/Authorization.java b/guacamole/src/main/java/org/apache/guacamole/auth/Authorization.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/auth/Authorization.java rename to guacamole/src/main/java/org/apache/guacamole/auth/Authorization.java index 82974a369..9ff1c791e 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/Authorization.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/Authorization.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.auth; +package org.apache.guacamole.auth; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/UserMapping.java b/guacamole/src/main/java/org/apache/guacamole/auth/UserMapping.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/auth/UserMapping.java rename to guacamole/src/main/java/org/apache/guacamole/auth/UserMapping.java index 3853abc9d..7f86b1e0c 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/UserMapping.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/UserMapping.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.auth; +package org.apache.guacamole.auth; import java.util.HashMap; import java.util.Map; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/basic/AuthorizeTagHandler.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java rename to guacamole/src/main/java/org/apache/guacamole/auth/basic/AuthorizeTagHandler.java index 54a54e057..bdd9c9a46 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/AuthorizeTagHandler.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/basic/AuthorizeTagHandler.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.xml.usermapping; +package org.apache.guacamole.auth.basic; -import org.apache.guacamole.net.basic.auth.Authorization; -import org.apache.guacamole.net.basic.auth.UserMapping; +import org.apache.guacamole.auth.Authorization; +import org.apache.guacamole.auth.UserMapping; import org.apache.guacamole.xml.TagHandler; import org.apache.guacamole.protocol.GuacamoleConfiguration; import org.xml.sax.Attributes; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/org/apache/guacamole/auth/basic/BasicFileAuthenticationProvider.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/BasicFileAuthenticationProvider.java rename to guacamole/src/main/java/org/apache/guacamole/auth/basic/BasicFileAuthenticationProvider.java index 7fe6bbd20..be3fd1a35 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/BasicFileAuthenticationProvider.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/basic/BasicFileAuthenticationProvider.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole.auth.basic; import java.io.BufferedInputStream; import java.io.File; @@ -29,14 +29,14 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; import org.apache.guacamole.GuacamoleException; +import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; import org.apache.guacamole.environment.LocalEnvironment; import org.apache.guacamole.net.auth.Credentials; import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider; -import org.apache.guacamole.net.basic.auth.Authorization; -import org.apache.guacamole.net.basic.auth.UserMapping; +import org.apache.guacamole.auth.Authorization; +import org.apache.guacamole.auth.UserMapping; import org.apache.guacamole.xml.DocumentHandler; -import org.apache.guacamole.net.basic.xml.usermapping.UserMappingTagHandler; import org.apache.guacamole.properties.FileGuacamoleProperty; import org.apache.guacamole.protocol.GuacamoleConfiguration; import org.slf4j.Logger; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/basic/ConnectionTagHandler.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java rename to guacamole/src/main/java/org/apache/guacamole/auth/basic/ConnectionTagHandler.java index 0c02f9513..f9acabb0a 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ConnectionTagHandler.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/basic/ConnectionTagHandler.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.xml.usermapping; +package org.apache.guacamole.auth.basic; -import org.apache.guacamole.net.basic.auth.Authorization; +import org.apache.guacamole.auth.Authorization; import org.apache.guacamole.xml.TagHandler; import org.apache.guacamole.protocol.GuacamoleConfiguration; import org.xml.sax.Attributes; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ParamTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/basic/ParamTagHandler.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ParamTagHandler.java rename to guacamole/src/main/java/org/apache/guacamole/auth/basic/ParamTagHandler.java index 4c5ef8bd0..5d3d804bb 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ParamTagHandler.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/basic/ParamTagHandler.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.xml.usermapping; +package org.apache.guacamole.auth.basic; import org.apache.guacamole.xml.TagHandler; import org.apache.guacamole.protocol.GuacamoleConfiguration; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/basic/ProtocolTagHandler.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java rename to guacamole/src/main/java/org/apache/guacamole/auth/basic/ProtocolTagHandler.java index b00b711f1..3fc5f12da 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/ProtocolTagHandler.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/basic/ProtocolTagHandler.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.xml.usermapping; +package org.apache.guacamole.auth.basic; import org.apache.guacamole.xml.TagHandler; import org.apache.guacamole.protocol.GuacamoleConfiguration; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java b/guacamole/src/main/java/org/apache/guacamole/auth/basic/UserMappingTagHandler.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java rename to guacamole/src/main/java/org/apache/guacamole/auth/basic/UserMappingTagHandler.java index 144b2c47d..f0bb6fafb 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/UserMappingTagHandler.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/basic/UserMappingTagHandler.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.xml.usermapping; +package org.apache.guacamole.auth.basic; -import org.apache.guacamole.net.basic.auth.UserMapping; +import org.apache.guacamole.auth.UserMapping; import org.apache.guacamole.xml.TagHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/package-info.java b/guacamole/src/main/java/org/apache/guacamole/auth/basic/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/auth/basic/package-info.java index dfb580b0c..d5f8fb7e4 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/xml/usermapping/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/basic/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to parsing the user-mapping.xml file. */ -package org.apache.guacamole.net.basic.xml.usermapping; +package org.apache.guacamole.auth.basic; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/package-info.java b/guacamole/src/main/java/org/apache/guacamole/auth/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/auth/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/auth/package-info.java index 58313778d..d1ac69e7d 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/auth/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/auth/package-info.java @@ -24,5 +24,5 @@ * Classes which drive the default, basic authentication of the Guacamole * web application. */ -package org.apache.guacamole.net.basic.auth; +package org.apache.guacamole.auth; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/AuthenticationProviderFacade.java b/guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/AuthenticationProviderFacade.java rename to guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java index b63c84694..b24425532 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/AuthenticationProviderFacade.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; import java.lang.reflect.InvocationTargetException; import java.util.UUID; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/DirectoryClassLoader.java b/guacamole/src/main/java/org/apache/guacamole/extension/DirectoryClassLoader.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/DirectoryClassLoader.java rename to guacamole/src/main/java/org/apache/guacamole/extension/DirectoryClassLoader.java index e69c23092..1d1ac54bf 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/DirectoryClassLoader.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/DirectoryClassLoader.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; import java.io.File; import java.io.FilenameFilter; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/Extension.java b/guacamole/src/main/java/org/apache/guacamole/extension/Extension.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/Extension.java rename to guacamole/src/main/java/org/apache/guacamole/extension/Extension.java index 120690a30..7ac0563c5 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/Extension.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/Extension.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; import java.io.File; import java.io.IOException; @@ -43,8 +43,8 @@ import org.codehaus.jackson.map.ObjectMapper; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.net.auth.AuthenticationProvider; -import org.apache.guacamole.net.basic.resource.ClassPathResource; -import org.apache.guacamole.net.basic.resource.Resource; +import org.apache.guacamole.resource.ClassPathResource; +import org.apache.guacamole.resource.Resource; /** * A Guacamole extension, which may provide custom authentication, static diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionManifest.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionManifest.java rename to guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java index 44efdaebf..3e2a8aed5 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionManifest.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionManifest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; import java.util.Collection; import java.util.Map; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java rename to guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java index 7fcf6d4fb..cb3c0efa8 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; import com.google.inject.Provides; import com.google.inject.servlet.ServletModule; @@ -32,16 +32,16 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.guacamole.net.basic.BasicFileAuthenticationProvider; +import org.apache.guacamole.auth.basic.BasicFileAuthenticationProvider; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.environment.Environment; import org.apache.guacamole.net.auth.AuthenticationProvider; -import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties; -import org.apache.guacamole.net.basic.resource.Resource; -import org.apache.guacamole.net.basic.resource.ResourceServlet; -import org.apache.guacamole.net.basic.resource.SequenceResource; -import org.apache.guacamole.net.basic.resource.WebApplicationResource; +import org.apache.guacamole.properties.BasicGuacamoleProperties; +import org.apache.guacamole.resource.Resource; +import org.apache.guacamole.resource.ResourceServlet; +import org.apache.guacamole.resource.SequenceResource; +import org.apache.guacamole.resource.WebApplicationResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/LanguageResourceService.java b/guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/LanguageResourceService.java rename to guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java index 6423b5dc8..c04388708 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/LanguageResourceService.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/LanguageResourceService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; import java.io.IOException; import java.io.InputStream; @@ -38,10 +38,10 @@ import org.codehaus.jackson.node.JsonNodeFactory; import org.codehaus.jackson.node.ObjectNode; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; -import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties; -import org.apache.guacamole.net.basic.resource.ByteArrayResource; -import org.apache.guacamole.net.basic.resource.Resource; -import org.apache.guacamole.net.basic.resource.WebApplicationResource; +import org.apache.guacamole.properties.BasicGuacamoleProperties; +import org.apache.guacamole.resource.ByteArrayResource; +import org.apache.guacamole.resource.Resource; +import org.apache.guacamole.resource.WebApplicationResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/PatchResourceService.java b/guacamole/src/main/java/org/apache/guacamole/extension/PatchResourceService.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/PatchResourceService.java rename to guacamole/src/main/java/org/apache/guacamole/extension/PatchResourceService.java index 76ef104c0..e0c1c0bbd 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/PatchResourceService.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/PatchResourceService.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.guacamole.net.basic.resource.Resource; +import org.apache.guacamole.resource.Resource; /** * Service which provides access to all HTML patches as resources, and allows diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/package-info.java b/guacamole/src/main/java/org/apache/guacamole/extension/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/extension/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/extension/package-info.java index 9675904f3..02f4afc6a 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/extension/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/package-info.java @@ -24,4 +24,4 @@ * Classes which represent and facilitate the loading of extensions to the * Guacamole web application. */ -package org.apache.guacamole.net.basic.extension; +package org.apache.guacamole.extension; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/log/LogModule.java b/guacamole/src/main/java/org/apache/guacamole/log/LogModule.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/log/LogModule.java rename to guacamole/src/main/java/org/apache/guacamole/log/LogModule.java index 739460ddd..67e93c427 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/log/LogModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/log/LogModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.log; +package org.apache.guacamole.log; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/package-info.java b/guacamole/src/main/java/org/apache/guacamole/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/package-info.java index 183b53031..63ee12eca 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/package-info.java @@ -24,5 +24,5 @@ * Classes specific to the general-purpose web application implemented by * the Guacamole project using the Guacamole APIs. */ -package org.apache.guacamole.net.basic; +package org.apache.guacamole; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/AuthenticationProviderProperty.java b/guacamole/src/main/java/org/apache/guacamole/properties/AuthenticationProviderProperty.java similarity index 93% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/properties/AuthenticationProviderProperty.java rename to guacamole/src/main/java/org/apache/guacamole/properties/AuthenticationProviderProperty.java index 1c1513100..09f357695 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/AuthenticationProviderProperty.java +++ b/guacamole/src/main/java/org/apache/guacamole/properties/AuthenticationProviderProperty.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.properties; +package org.apache.guacamole.properties; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.auth.AuthenticationProvider; @@ -49,7 +49,7 @@ public abstract class AuthenticationProviderProperty implements GuacamolePropert try { // Get authentication provider class - Class authProviderClass = org.apache.guacamole.net.basic.GuacamoleClassLoader.getInstance().loadClass(authProviderClassName); + Class authProviderClass = org.apache.guacamole.GuacamoleClassLoader.getInstance().loadClass(authProviderClassName); // Verify the located class is actually a subclass of AuthenticationProvider if (!AuthenticationProvider.class.isAssignableFrom(authProviderClass)) diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/BasicGuacamoleProperties.java b/guacamole/src/main/java/org/apache/guacamole/properties/BasicGuacamoleProperties.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/properties/BasicGuacamoleProperties.java rename to guacamole/src/main/java/org/apache/guacamole/properties/BasicGuacamoleProperties.java index b75d1c3b0..9d8d99f82 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/BasicGuacamoleProperties.java +++ b/guacamole/src/main/java/org/apache/guacamole/properties/BasicGuacamoleProperties.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.properties; +package org.apache.guacamole.properties; import org.apache.guacamole.properties.FileGuacamoleProperty; import org.apache.guacamole.properties.IntegerGuacamoleProperty; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/StringSetProperty.java b/guacamole/src/main/java/org/apache/guacamole/properties/StringSetProperty.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/properties/StringSetProperty.java rename to guacamole/src/main/java/org/apache/guacamole/properties/StringSetProperty.java index 34fb58af0..5bcd13c3e 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/StringSetProperty.java +++ b/guacamole/src/main/java/org/apache/guacamole/properties/StringSetProperty.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.properties; +package org.apache.guacamole.properties; import java.util.Arrays; import java.util.HashSet; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/package-info.java b/guacamole/src/main/java/org/apache/guacamole/properties/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/properties/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/properties/package-info.java index 6ca9523ec..0640815f5 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/properties/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/properties/package-info.java @@ -24,5 +24,5 @@ * Classes related to the properties which the Guacamole web application * (and stock parts of it) read from guacamole.properties. */ -package org.apache.guacamole.net.basic.properties; +package org.apache.guacamole.properties; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/AbstractResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/AbstractResource.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/AbstractResource.java rename to guacamole/src/main/java/org/apache/guacamole/resource/AbstractResource.java index c4489a479..f98536121 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/AbstractResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/AbstractResource.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; /** * Base abstract resource implementation which provides an associated mimetype, diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ByteArrayResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/ByteArrayResource.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ByteArrayResource.java rename to guacamole/src/main/java/org/apache/guacamole/resource/ByteArrayResource.java index af071d8d6..2fa819915 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ByteArrayResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/ByteArrayResource.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ClassPathResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/ClassPathResource.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ClassPathResource.java rename to guacamole/src/main/java/org/apache/guacamole/resource/ClassPathResource.java index 5dc539224..fb81791f6 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ClassPathResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/ClassPathResource.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; import java.io.InputStream; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/Resource.java b/guacamole/src/main/java/org/apache/guacamole/resource/Resource.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/Resource.java rename to guacamole/src/main/java/org/apache/guacamole/resource/Resource.java index f8accdd08..845bd7209 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/Resource.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/Resource.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; import java.io.InputStream; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ResourceServlet.java b/guacamole/src/main/java/org/apache/guacamole/resource/ResourceServlet.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ResourceServlet.java rename to guacamole/src/main/java/org/apache/guacamole/resource/ResourceServlet.java index 826604901..f1af7c6b2 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ResourceServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/ResourceServlet.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; import java.io.IOException; import java.io.InputStream; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/SequenceResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/SequenceResource.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/SequenceResource.java rename to guacamole/src/main/java/org/apache/guacamole/resource/SequenceResource.java index 635adf55f..fe407b5bb 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/SequenceResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/SequenceResource.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; import java.io.InputStream; import java.io.SequenceInputStream; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/WebApplicationResource.java b/guacamole/src/main/java/org/apache/guacamole/resource/WebApplicationResource.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/WebApplicationResource.java rename to guacamole/src/main/java/org/apache/guacamole/resource/WebApplicationResource.java index 5e22831cc..b8aae1472 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/WebApplicationResource.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/WebApplicationResource.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; import java.io.InputStream; import javax.servlet.ServletContext; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/package-info.java b/guacamole/src/main/java/org/apache/guacamole/resource/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/resource/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/resource/package-info.java index 6e1829f62..edbe504f5 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/resource/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/resource/package-info.java @@ -25,4 +25,4 @@ * the contents of the classpath of a classloader, or files within the web * application itself. */ -package org.apache.guacamole.net.basic.resource; +package org.apache.guacamole.resource; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIError.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIError.java rename to guacamole/src/main/java/org/apache/guacamole/rest/APIError.java index 642fb3927..74fa7d224 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIError.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIError.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import java.util.Collection; import javax.ws.rs.core.Response; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIException.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIException.java rename to guacamole/src/main/java/org/apache/guacamole/rest/APIException.java index 50f05a2b0..7a70fb8a1 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIException.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import java.util.Collection; import javax.ws.rs.WebApplicationException; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIPatch.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIPatch.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIPatch.java rename to guacamole/src/main/java/org/apache/guacamole/rest/APIPatch.java index 3be1eac76..08ee0629b 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIPatch.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIPatch.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; /** * An object for representing the body of a HTTP PATCH method. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIRequest.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIRequest.java rename to guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java index 566990a12..cd4fcd525 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIRequest.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIRequest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import java.util.Collections; import java.util.Enumeration; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/ObjectRetrievalService.java b/guacamole/src/main/java/org/apache/guacamole/rest/ObjectRetrievalService.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/ObjectRetrievalService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/ObjectRetrievalService.java index 90dcf9e61..1cf891930 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/ObjectRetrievalService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/ObjectRetrievalService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import java.util.List; import org.apache.guacamole.GuacamoleException; @@ -31,8 +31,8 @@ import org.apache.guacamole.net.auth.ConnectionGroup; import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.User; import org.apache.guacamole.net.auth.UserContext; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.connectiongroup.APIConnectionGroup; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.connectiongroup.APIConnectionGroup; /** * Provides easy access and automatic error handling for retrieval of objects, diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/PATCH.java b/guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/PATCH.java rename to guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java index 84350c6c0..f87ca98b0 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/PATCH.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/PATCH.java @@ -21,7 +21,7 @@ */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTExceptionWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTExceptionWrapper.java rename to guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java index 319bc628a..0193e22ea 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTExceptionWrapper.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import com.google.inject.Inject; import java.lang.annotation.Annotation; @@ -36,7 +36,7 @@ import org.apache.guacamole.GuacamoleSecurityException; import org.apache.guacamole.GuacamoleUnauthorizedException; import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException; import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; +import org.apache.guacamole.rest.auth.AuthenticationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTMethodMatcher.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTMethodMatcher.java rename to guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java index 08f14e140..0283e63d7 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTMethodMatcher.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTMethodMatcher.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import com.google.inject.matcher.AbstractMatcher; import java.lang.annotation.Annotation; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTServiceModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java similarity index 78% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTServiceModule.java rename to guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java index 9174aad99..5458aecad 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTServiceModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; import com.google.inject.Scopes; import com.google.inject.matcher.Matchers; @@ -28,19 +28,19 @@ import com.google.inject.servlet.ServletModule; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import org.aopalliance.intercept.MethodInterceptor; import org.codehaus.jackson.jaxrs.JacksonJsonProvider; -import org.apache.guacamole.net.basic.rest.auth.TokenRESTService; -import org.apache.guacamole.net.basic.rest.connection.ConnectionRESTService; -import org.apache.guacamole.net.basic.rest.connectiongroup.ConnectionGroupRESTService; -import org.apache.guacamole.net.basic.rest.activeconnection.ActiveConnectionRESTService; -import org.apache.guacamole.net.basic.rest.auth.AuthTokenGenerator; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; -import org.apache.guacamole.net.basic.rest.auth.SecureRandomAuthTokenGenerator; -import org.apache.guacamole.net.basic.rest.auth.TokenSessionMap; -import org.apache.guacamole.net.basic.rest.history.HistoryRESTService; -import org.apache.guacamole.net.basic.rest.language.LanguageRESTService; -import org.apache.guacamole.net.basic.rest.patch.PatchRESTService; -import org.apache.guacamole.net.basic.rest.schema.SchemaRESTService; -import org.apache.guacamole.net.basic.rest.user.UserRESTService; +import org.apache.guacamole.rest.auth.TokenRESTService; +import org.apache.guacamole.rest.connection.ConnectionRESTService; +import org.apache.guacamole.rest.connectiongroup.ConnectionGroupRESTService; +import org.apache.guacamole.rest.activeconnection.ActiveConnectionRESTService; +import org.apache.guacamole.rest.auth.AuthTokenGenerator; +import org.apache.guacamole.rest.auth.AuthenticationService; +import org.apache.guacamole.rest.auth.SecureRandomAuthTokenGenerator; +import org.apache.guacamole.rest.auth.TokenSessionMap; +import org.apache.guacamole.rest.history.HistoryRESTService; +import org.apache.guacamole.rest.language.LanguageRESTService; +import org.apache.guacamole.rest.patch.PatchRESTService; +import org.apache.guacamole.rest.schema.SchemaRESTService; +import org.apache.guacamole.rest.user.UserRESTService; /** * A Guice Module to set up the servlet mappings and authentication-specific diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIActiveConnection.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java rename to guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIActiveConnection.java index b695381f4..b8923335f 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/APIActiveConnection.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.activeconnection; +package org.apache.guacamole.rest.activeconnection; import java.util.Date; import org.apache.guacamole.net.auth.ActiveConnection; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionRESTService.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionRESTService.java index 929009bfd..90e16087b 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/activeconnection/ActiveConnectionRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.activeconnection; +package org.apache.guacamole.rest.activeconnection; import com.google.inject.Inject; import java.util.Collection; @@ -45,11 +45,11 @@ import org.apache.guacamole.net.auth.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; import org.apache.guacamole.net.auth.permission.SystemPermission; import org.apache.guacamole.net.auth.permission.SystemPermissionSet; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.APIPatch; -import org.apache.guacamole.net.basic.rest.ObjectRetrievalService; -import org.apache.guacamole.net.basic.rest.PATCH; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.APIPatch; +import org.apache.guacamole.rest.ObjectRetrievalService; +import org.apache.guacamole.rest.PATCH; +import org.apache.guacamole.rest.auth.AuthenticationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResponse.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResponse.java index 4bb61e1c5..f0a43060a 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResponse.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; /** * A simple object to represent an auth token/username pair in the API. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResult.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResult.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResult.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResult.java index b7eed272b..fa1c0808b 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResult.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/APIAuthenticationResult.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; import java.util.Collections; import java.util.List; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthTokenGenerator.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthTokenGenerator.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthTokenGenerator.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthTokenGenerator.java index c6528af75..cdab5aaaf 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthTokenGenerator.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthTokenGenerator.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; /** * Generates an auth token for an authenticated user. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthenticationService.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthenticationService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java index 1e11f9b39..7fa51e519 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthenticationService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; import com.google.inject.Inject; import java.util.ArrayList; @@ -38,7 +38,7 @@ import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.credentials.CredentialsInfo; import org.apache.guacamole.net.auth.credentials.GuacamoleCredentialsException; import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException; -import org.apache.guacamole.net.basic.GuacamoleSession; +import org.apache.guacamole.GuacamoleSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/BasicTokenSessionMap.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/BasicTokenSessionMap.java index 42f513e05..9de33fbb2 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/BasicTokenSessionMap.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; import java.util.Iterator; import java.util.Map; @@ -31,8 +31,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.environment.Environment; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.properties.BasicGuacamoleProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/SecureRandomAuthTokenGenerator.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/SecureRandomAuthTokenGenerator.java index 9c32ae2ad..ed93bd453 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/SecureRandomAuthTokenGenerator.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; import java.security.SecureRandom; import org.apache.commons.codec.binary.Hex; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java index df37955c2..5a062fb60 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; import com.google.inject.Inject; import java.io.UnsupportedEncodingException; @@ -42,8 +42,8 @@ import org.apache.guacamole.GuacamoleResourceNotFoundException; import org.apache.guacamole.net.auth.AuthenticatedUser; import org.apache.guacamole.net.auth.Credentials; import org.apache.guacamole.net.auth.UserContext; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.APIRequest; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.APIRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenSessionMap.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenSessionMap.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenSessionMap.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenSessionMap.java index 39764af9a..756084ad5 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenSessionMap.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/TokenSessionMap.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; -import org.apache.guacamole.net.basic.GuacamoleSession; +import org.apache.guacamole.GuacamoleSession; /** * Represents a mapping of auth token to Guacamole session for the REST diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/auth/package-info.java index ef40778e5..d58bede94 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to the authentication aspect of the Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.auth; +package org.apache.guacamole.rest.auth; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnection.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnection.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java index 4c1877ed3..0a607f722 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnection.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnection.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.connection; +package org.apache.guacamole.rest.connection; import java.util.Map; import org.codehaus.jackson.annotate.JsonIgnoreProperties; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnectionWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnectionWrapper.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnectionWrapper.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnectionWrapper.java index 0b5de25c4..a78593070 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnectionWrapper.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/APIConnectionWrapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.connection; +package org.apache.guacamole.rest.connection; import java.util.Collections; import java.util.List; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/ConnectionRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionRESTService.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/ConnectionRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionRESTService.java index 616d21384..b30108286 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/ConnectionRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.connection; +package org.apache.guacamole.rest.connection; import com.google.inject.Inject; import java.util.ArrayList; @@ -48,10 +48,10 @@ import org.apache.guacamole.net.auth.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; import org.apache.guacamole.net.auth.permission.SystemPermission; import org.apache.guacamole.net.auth.permission.SystemPermissionSet; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.ObjectRetrievalService; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; -import org.apache.guacamole.net.basic.rest.history.APIConnectionRecord; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.ObjectRetrievalService; +import org.apache.guacamole.rest.auth.AuthenticationService; +import org.apache.guacamole.rest.history.APIConnectionRecord; import org.apache.guacamole.protocol.GuacamoleConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connection/package-info.java index ba92eaae5..d80155f95 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to the connection manipulation aspect of the Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.connection; +package org.apache.guacamole.rest.connection; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java index bf98a08f0..67dea8eb5 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroup.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.connectiongroup; +package org.apache.guacamole.rest.connectiongroup; import java.util.Collection; import java.util.Map; @@ -28,7 +28,7 @@ import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.apache.guacamole.net.auth.ConnectionGroup; import org.apache.guacamole.net.auth.ConnectionGroup.Type; -import org.apache.guacamole.net.basic.rest.connection.APIConnection; +import org.apache.guacamole.rest.connection.APIConnection; /** * A simple connection group to expose through the REST endpoints. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroupWrapper.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroupWrapper.java index ff3774651..0c8198a01 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/APIConnectionGroupWrapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.connectiongroup; +package org.apache.guacamole.rest.connectiongroup; import java.util.Map; import java.util.Set; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupRESTService.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupRESTService.java index 2f113deea..84e5283b4 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.connectiongroup; +package org.apache.guacamole.rest.connectiongroup; import com.google.inject.Inject; import java.util.List; @@ -40,9 +40,9 @@ import org.apache.guacamole.net.auth.ConnectionGroup; import org.apache.guacamole.net.auth.Directory; import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.permission.ObjectPermission; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.ObjectRetrievalService; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.ObjectRetrievalService; +import org.apache.guacamole.rest.auth.AuthenticationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupTree.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupTree.java index 7b8946648..75e46ae7f 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/ConnectionGroupTree.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.connectiongroup; +package org.apache.guacamole.rest.connectiongroup; import java.util.ArrayList; import java.util.Collection; @@ -34,7 +34,7 @@ import org.apache.guacamole.net.auth.ConnectionGroup; import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.net.auth.permission.ObjectPermission; import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; -import org.apache.guacamole.net.basic.rest.connection.APIConnection; +import org.apache.guacamole.rest.connection.APIConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/package-info.java index 0b5d6da68..91529897e 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/connectiongroup/package-info.java @@ -24,5 +24,5 @@ * Classes related to the connection group manipulation aspect * of the Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.connectiongroup; +package org.apache.guacamole.rest.connectiongroup; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecord.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecord.java rename to guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java index d583c15a3..e5d92a022 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecord.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecord.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.history; +package org.apache.guacamole.rest.history; import java.util.Date; import org.apache.guacamole.net.auth.ConnectionRecord; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java rename to guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java index 29971e52f..7006f58fe 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/APIConnectionRecordSortPredicate.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.history; +package org.apache.guacamole.rest.history; import org.apache.guacamole.net.auth.ConnectionRecordSet; -import org.apache.guacamole.net.basic.rest.APIError; -import org.apache.guacamole.net.basic.rest.APIException; +import org.apache.guacamole.rest.APIError; +import org.apache.guacamole.rest.APIException; /** * A sort predicate which species the property to use when sorting connection diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/HistoryRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryRESTService.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/HistoryRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryRESTService.java index e6f0b50e4..f5d4651f9 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/HistoryRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/HistoryRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.history; +package org.apache.guacamole.rest.history; import com.google.inject.Inject; import java.util.ArrayList; @@ -36,9 +36,9 @@ import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.auth.ConnectionRecord; import org.apache.guacamole.net.auth.ConnectionRecordSet; import org.apache.guacamole.net.auth.UserContext; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.ObjectRetrievalService; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.ObjectRetrievalService; +import org.apache.guacamole.rest.auth.AuthenticationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/history/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/history/package-info.java index 3dc031ad3..ed2d0fcaf 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/history/package-info.java @@ -24,5 +24,5 @@ * Classes related to retrieval or maintenance of history records using the * Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.history; +package org.apache.guacamole.rest.history; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/LanguageRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/language/LanguageRESTService.java similarity index 94% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/LanguageRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/language/LanguageRESTService.java index 9e878e83f..2595ae3ca 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/LanguageRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/language/LanguageRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.language; +package org.apache.guacamole.rest.language; import com.google.inject.Inject; import java.util.Map; @@ -28,7 +28,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.apache.guacamole.net.basic.extension.LanguageResourceService; +import org.apache.guacamole.extension.LanguageResourceService; /** diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/language/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/language/package-info.java index 96203506f..cb0a19050 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/language/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to the language retrieval aspect of the Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.language; +package org.apache.guacamole.rest.language; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/package-info.java index e61d11e07..541ff7625 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to the basic Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest; +package org.apache.guacamole.rest; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/PatchRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/patch/PatchRESTService.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/PatchRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/patch/PatchRESTService.java index 4cd90cd89..1d823b15b 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/PatchRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/patch/PatchRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.patch; +package org.apache.guacamole.rest.patch; import com.google.inject.Inject; import java.io.IOException; @@ -34,8 +34,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleServerException; -import org.apache.guacamole.net.basic.extension.PatchResourceService; -import org.apache.guacamole.net.basic.resource.Resource; +import org.apache.guacamole.extension.PatchResourceService; +import org.apache.guacamole.resource.Resource; /** * A REST Service for handling the listing of HTML patches. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/patch/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/patch/package-info.java index 549efc2a9..399c3299f 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/patch/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to the HTML patch retrieval aspect of the Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.patch; +package org.apache.guacamole.rest.patch; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/APIPermissionSet.java b/guacamole/src/main/java/org/apache/guacamole/rest/permission/APIPermissionSet.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/APIPermissionSet.java rename to guacamole/src/main/java/org/apache/guacamole/rest/permission/APIPermissionSet.java index 2965bfc72..1f57ee5f8 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/APIPermissionSet.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/permission/APIPermissionSet.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.permission; +package org.apache.guacamole.rest.permission; import java.util.EnumSet; import java.util.HashMap; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/permission/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/permission/package-info.java index 8312852fe..e23eadf89 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/permission/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to the permission manipulation aspect of the Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.permission; +package org.apache.guacamole.rest.permission; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/SchemaRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaRESTService.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/SchemaRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaRESTService.java index dfd92989d..3d52e8eb2 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/SchemaRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.schema; +package org.apache.guacamole.rest.schema; import com.google.inject.Inject; import java.util.Collection; @@ -37,9 +37,9 @@ import org.apache.guacamole.environment.Environment; import org.apache.guacamole.environment.LocalEnvironment; import org.apache.guacamole.form.Form; import org.apache.guacamole.net.auth.UserContext; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.ObjectRetrievalService; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.ObjectRetrievalService; +import org.apache.guacamole.rest.auth.AuthenticationService; import org.apache.guacamole.protocols.ProtocolInfo; /** diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/schema/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/schema/package-info.java index a005d7eee..68dfa4749 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/schema/package-info.java @@ -24,4 +24,4 @@ * Classes related to the self-description of the Guacamole REST API, such as * the attributes or parameters applicable to specific objects. */ -package org.apache.guacamole.net.basic.rest.schema; +package org.apache.guacamole.rest.schema; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUser.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUser.java rename to guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java index bcbbf7e27..286c4de14 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUser.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUser.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.user; +package org.apache.guacamole.rest.user; import java.util.Map; import org.codehaus.jackson.annotate.JsonIgnoreProperties; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserPasswordUpdate.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java rename to guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserPasswordUpdate.java index 483a141f1..a4b47e8c7 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserPasswordUpdate.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.user; +package org.apache.guacamole.rest.user; /** * All the information necessary for the password update operation on a user. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserWrapper.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserWrapper.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserWrapper.java rename to guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserWrapper.java index 68931e0a6..d25b91555 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserWrapper.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/APIUserWrapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.user; +package org.apache.guacamole.rest.user; import java.util.Map; import org.apache.guacamole.GuacamoleException; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/PermissionSetPatch.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/PermissionSetPatch.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/PermissionSetPatch.java rename to guacamole/src/main/java/org/apache/guacamole/rest/user/PermissionSetPatch.java index a39838897..02172ea4e 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/PermissionSetPatch.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/PermissionSetPatch.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.user; +package org.apache.guacamole.rest.user; import java.util.HashSet; import java.util.Set; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/UserRESTService.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserRESTService.java similarity index 97% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/UserRESTService.java rename to guacamole/src/main/java/org/apache/guacamole/rest/user/UserRESTService.java index 9c79eefdb..529bb823d 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/UserRESTService.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/UserRESTService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.rest.user; +package org.apache.guacamole.rest.user; import com.google.inject.Inject; import java.util.ArrayList; @@ -54,14 +54,14 @@ import org.apache.guacamole.net.auth.permission.ObjectPermissionSet; import org.apache.guacamole.net.auth.permission.Permission; import org.apache.guacamole.net.auth.permission.SystemPermission; import org.apache.guacamole.net.auth.permission.SystemPermissionSet; -import org.apache.guacamole.net.basic.GuacamoleSession; -import org.apache.guacamole.net.basic.rest.APIPatch; -import static org.apache.guacamole.net.basic.rest.APIPatch.Operation.add; -import static org.apache.guacamole.net.basic.rest.APIPatch.Operation.remove; -import org.apache.guacamole.net.basic.rest.ObjectRetrievalService; -import org.apache.guacamole.net.basic.rest.PATCH; -import org.apache.guacamole.net.basic.rest.auth.AuthenticationService; -import org.apache.guacamole.net.basic.rest.permission.APIPermissionSet; +import org.apache.guacamole.GuacamoleSession; +import org.apache.guacamole.rest.APIPatch; +import static org.apache.guacamole.rest.APIPatch.Operation.add; +import static org.apache.guacamole.rest.APIPatch.Operation.remove; +import org.apache.guacamole.rest.ObjectRetrievalService; +import org.apache.guacamole.rest.PATCH; +import org.apache.guacamole.rest.auth.AuthenticationService; +import org.apache.guacamole.rest.permission.APIPermissionSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/package-info.java b/guacamole/src/main/java/org/apache/guacamole/rest/user/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/rest/user/package-info.java index dfa6d917a..ecc7846fa 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/user/package-info.java @@ -23,5 +23,5 @@ /** * Classes related to the user manipulation aspect of the Guacamole REST API. */ -package org.apache.guacamole.net.basic.rest.user; +package org.apache.guacamole.rest.user; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java b/guacamole/src/main/java/org/apache/guacamole/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java index 981c38331..744608a88 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket; +package org.apache.guacamole.websocket; import com.google.inject.Provider; import java.util.Map; @@ -31,8 +31,8 @@ import javax.websocket.server.HandshakeRequest; import javax.websocket.server.ServerEndpointConfig; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.GuacamoleTunnel; -import org.apache.guacamole.net.basic.TunnelRequest; -import org.apache.guacamole.net.basic.TunnelRequestService; +import org.apache.guacamole.TunnelRequest; +import org.apache.guacamole.TunnelRequestService; import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint; /** diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/websocket/WebSocketTunnelModule.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelModule.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/WebSocketTunnelModule.java index d3118b4f1..bfa265927 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/WebSocketTunnelModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket; +package org.apache.guacamole.websocket; import com.google.inject.Provider; import com.google.inject.servlet.ServletModule; @@ -28,8 +28,8 @@ import java.util.Arrays; import javax.websocket.DeploymentException; import javax.websocket.server.ServerContainer; import javax.websocket.server.ServerEndpointConfig; -import org.apache.guacamole.net.basic.TunnelLoader; -import org.apache.guacamole.net.basic.TunnelRequestService; +import org.apache.guacamole.TunnelLoader; +import org.apache.guacamole.TunnelRequestService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/websocket/WebSocketTunnelRequest.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelRequest.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/WebSocketTunnelRequest.java index 7c2b84427..5e20dbd7b 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelRequest.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/WebSocketTunnelRequest.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket; +package org.apache.guacamole.websocket; import java.util.List; import java.util.Map; import javax.websocket.server.HandshakeRequest; -import org.apache.guacamole.net.basic.TunnelRequest; +import org.apache.guacamole.TunnelRequest; /** * WebSocket-specific implementation of TunnelRequest. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java similarity index 91% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java index 6d12b2b39..f993270cb 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty8; +package org.apache.guacamole.websocket.jetty8; import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.GuacamoleTunnel; -import org.apache.guacamole.net.basic.TunnelRequestService; -import org.apache.guacamole.net.basic.TunnelRequest; +import org.apache.guacamole.TunnelRequestService; +import org.apache.guacamole.TunnelRequest; /** * Tunnel servlet implementation which uses WebSocket as a tunnel backend, diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java index 26f45dfe1..832faee38 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty8; +package org.apache.guacamole.websocket.jetty8; import java.io.IOException; import javax.servlet.http.HttpServletRequest; @@ -33,8 +33,8 @@ import org.eclipse.jetty.websocket.WebSocket.Connection; import org.eclipse.jetty.websocket.WebSocketServlet; import org.apache.guacamole.GuacamoleClientException; import org.apache.guacamole.GuacamoleConnectionClosedException; -import org.apache.guacamole.net.basic.HTTPTunnelRequest; -import org.apache.guacamole.net.basic.TunnelRequest; +import org.apache.guacamole.HTTPTunnelRequest; +import org.apache.guacamole.TunnelRequest; import org.apache.guacamole.protocol.GuacamoleStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/WebSocketTunnelModule.java similarity index 90% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/WebSocketTunnelModule.java index e4e037c9a..16c17a19a 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/WebSocketTunnelModule.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty8; +package org.apache.guacamole.websocket.jetty8; import com.google.inject.servlet.ServletModule; -import org.apache.guacamole.net.basic.TunnelLoader; +import org.apache.guacamole.TunnelLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader try { // Attempt to find WebSocket servlet - Class.forName("org.apache.guacamole.net.basic.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet"); + Class.forName("org.apache.guacamole.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet"); // Support found return true; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/package-info.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/package-info.java index 8cd31bed8..584892e71 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty8/package-info.java @@ -23,5 +23,5 @@ /** * Jetty 8 WebSocket tunnel implementation. The classes here require Jetty 8. */ -package org.apache.guacamole.net.basic.websocket.jetty8; +package org.apache.guacamole.websocket.jetty8; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketCreator.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketCreator.java index d7ba080b6..9528509ea 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketCreator.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty9; +package org.apache.guacamole.websocket.jetty9; import org.eclipse.jetty.websocket.api.UpgradeRequest; import org.eclipse.jetty.websocket.api.UpgradeResponse; import org.eclipse.jetty.websocket.servlet.WebSocketCreator; -import org.apache.guacamole.net.basic.TunnelRequestService; +import org.apache.guacamole.TunnelRequestService; /** * WebSocketCreator which selects the appropriate WebSocketListener diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java index de67830fd..2c2e91c48 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty9; +package org.apache.guacamole.websocket.jetty9; import org.eclipse.jetty.websocket.api.Session; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.GuacamoleTunnel; -import org.apache.guacamole.net.basic.TunnelRequestService; +import org.apache.guacamole.TunnelRequestService; /** * WebSocket listener implementation which properly parses connection IDs diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java similarity index 94% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java index 65f673d38..f16558d9d 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty9; +package org.apache.guacamole.websocket.jetty9; import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jetty.websocket.servlet.WebSocketServlet; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; -import org.apache.guacamole.net.basic.TunnelRequestService; +import org.apache.guacamole.TunnelRequestService; /** * A WebSocketServlet partial re-implementation of GuacamoleTunnelServlet. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/GuacamoleWebSocketTunnelListener.java similarity index 99% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/GuacamoleWebSocketTunnelListener.java index 1ca516ebf..368913d30 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/GuacamoleWebSocketTunnelListener.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty9; +package org.apache.guacamole.websocket.jetty9; import java.io.IOException; import org.eclipse.jetty.websocket.api.CloseStatus; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/WebSocketTunnelModule.java similarity index 90% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/WebSocketTunnelModule.java index a2958e3d6..aa6279768 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/WebSocketTunnelModule.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty9; +package org.apache.guacamole.websocket.jetty9; import com.google.inject.servlet.ServletModule; -import org.apache.guacamole.net.basic.TunnelLoader; +import org.apache.guacamole.TunnelLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader try { // Attempt to find WebSocket servlet - Class.forName("org.apache.guacamole.net.basic.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet"); + Class.forName("org.apache.guacamole.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet"); // Support found return true; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/WebSocketTunnelRequest.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/WebSocketTunnelRequest.java index b807f9fa7..4625be3ff 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/WebSocketTunnelRequest.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.jetty9; +package org.apache.guacamole.websocket.jetty9; import java.util.Arrays; import java.util.List; import java.util.Map; import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.apache.guacamole.net.basic.TunnelRequest; +import org.apache.guacamole.TunnelRequest; /** * Jetty 9 WebSocket-specific implementation of TunnelRequest. diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/package-info.java b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/package-info.java index 21d8b2c12..9b46c789d 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/jetty9/package-info.java @@ -24,5 +24,5 @@ * Jetty 9 WebSocket tunnel implementation. The classes here require at least * Jetty 9, prior to Jetty 9.1 (when support for JSR 356 was implemented). */ -package org.apache.guacamole.net.basic.websocket.jetty9; +package org.apache.guacamole.websocket.jetty9; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/package-info.java b/guacamole/src/main/java/org/apache/guacamole/websocket/package-info.java similarity index 96% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/package-info.java index a6f995711..b478bff3e 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/package-info.java @@ -24,5 +24,5 @@ * Standard WebSocket tunnel implementation. The classes here require a recent * servlet container that supports JSR 356. */ -package org.apache.guacamole.net.basic.websocket; +package org.apache.guacamole.websocket; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java similarity index 91% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java index 60361a70a..73843e8c8 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/BasicGuacamoleWebSocketTunnelServlet.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.tomcat; +package org.apache.guacamole.websocket.tomcat; import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.GuacamoleTunnel; -import org.apache.guacamole.net.basic.TunnelRequestService; -import org.apache.guacamole.net.basic.TunnelRequest; +import org.apache.guacamole.TunnelRequestService; +import org.apache.guacamole.TunnelRequest; /** * Tunnel servlet implementation which uses WebSocket as a tunnel backend, diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java similarity index 98% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java index 649c3cd8b..29275842b 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.tomcat; +package org.apache.guacamole.websocket.tomcat; import java.io.IOException; import java.io.InputStream; @@ -38,8 +38,8 @@ import org.apache.catalina.websocket.WebSocketServlet; import org.apache.catalina.websocket.WsOutbound; import org.apache.guacamole.GuacamoleClientException; import org.apache.guacamole.GuacamoleConnectionClosedException; -import org.apache.guacamole.net.basic.HTTPTunnelRequest; -import org.apache.guacamole.net.basic.TunnelRequest; +import org.apache.guacamole.HTTPTunnelRequest; +import org.apache.guacamole.TunnelRequest; import org.apache.guacamole.protocol.GuacamoleStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/WebSocketTunnelModule.java similarity index 90% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/WebSocketTunnelModule.java index 2ff57abd9..85caf1b00 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/WebSocketTunnelModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/WebSocketTunnelModule.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package org.apache.guacamole.net.basic.websocket.tomcat; +package org.apache.guacamole.websocket.tomcat; import com.google.inject.servlet.ServletModule; -import org.apache.guacamole.net.basic.TunnelLoader; +import org.apache.guacamole.TunnelLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader try { // Attempt to find WebSocket servlet - Class.forName("org.apache.guacamole.net.basic.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet"); + Class.forName("org.apache.guacamole.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet"); // Support found return true; diff --git a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/package-info.java b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/package-info.java similarity index 95% rename from guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/package-info.java rename to guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/package-info.java index a9a48f078..7083a3e2d 100644 --- a/guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/tomcat/package-info.java +++ b/guacamole/src/main/java/org/apache/guacamole/websocket/tomcat/package-info.java @@ -25,5 +25,5 @@ * Tomcat 7.0, and may change significantly as there is no common WebSocket * API for Java yet. */ -package org.apache.guacamole.net.basic.websocket.tomcat; +package org.apache.guacamole.websocket.tomcat; diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml index e1f535e53..6e105f825 100644 --- a/guacamole/src/main/webapp/WEB-INF/web.xml +++ b/guacamole/src/main/webapp/WEB-INF/web.xml @@ -42,7 +42,7 @@ - org.apache.guacamole.net.basic.BasicServletContextListener + org.apache.guacamole.BasicServletContextListener