From 81abdd0d3dd83f51cb11b471f7574887d0f26923 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 26 Apr 2015 20:58:36 -0700 Subject: [PATCH] GUAC-1170: Move modules back to separate packages. --- .../BasicServletContextListener.java | 12 +++++---- .../basic/{inject => }/EnvironmentModule.java | 2 +- .../net/basic/{inject => }/TunnelModule.java | 6 +---- .../net/basic/inject/package-info.java | 27 ------------------- .../net/basic/{inject => log}/LogModule.java | 2 +- .../RESTAuthModule.java} | 9 +++---- .../RESTServletModule.java} | 7 ++--- guacamole/src/main/webapp/WEB-INF/web.xml | 2 +- 8 files changed, 17 insertions(+), 50 deletions(-) rename guacamole/src/main/java/org/glyptodon/guacamole/net/basic/{inject => }/BasicServletContextListener.java (89%) rename guacamole/src/main/java/org/glyptodon/guacamole/net/basic/{inject => }/EnvironmentModule.java (97%) rename guacamole/src/main/java/org/glyptodon/guacamole/net/basic/{inject => }/TunnelModule.java (93%) delete mode 100644 guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/package-info.java rename guacamole/src/main/java/org/glyptodon/guacamole/net/basic/{inject => log}/LogModule.java (98%) rename guacamole/src/main/java/org/glyptodon/guacamole/net/basic/{inject/AuthenticationModule.java => rest/RESTAuthModule.java} (92%) rename guacamole/src/main/java/org/glyptodon/guacamole/net/basic/{inject/RESTModule.java => rest/RESTServletModule.java} (90%) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/BasicServletContextListener.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicServletContextListener.java similarity index 89% rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/BasicServletContextListener.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicServletContextListener.java index 4df326612..82f3983de 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/BasicServletContextListener.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicServletContextListener.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.net.basic.inject; +package org.glyptodon.guacamole.net.basic; import com.google.inject.Guice; import com.google.inject.Injector; @@ -30,6 +30,9 @@ import javax.servlet.ServletContextEvent; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.environment.Environment; import org.glyptodon.guacamole.environment.LocalEnvironment; +import org.glyptodon.guacamole.net.basic.log.LogModule; +import org.glyptodon.guacamole.net.basic.rest.RESTAuthModule; +import org.glyptodon.guacamole.net.basic.rest.RESTServletModule; import org.glyptodon.guacamole.net.basic.rest.auth.BasicTokenSessionMap; import org.glyptodon.guacamole.net.basic.rest.auth.TokenSessionMap; import org.slf4j.Logger; @@ -77,12 +80,11 @@ public class BasicServletContextListener extends GuiceServletContextListener { @Override protected Injector getInjector() { - return Guice.createInjector( - Stage.PRODUCTION, + return Guice.createInjector(Stage.PRODUCTION, new EnvironmentModule(environment), new LogModule(environment), - new AuthenticationModule(environment, sessionMap), - new RESTModule(), + new RESTAuthModule(environment, sessionMap), + new RESTServletModule(), new TunnelModule() ); } diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/EnvironmentModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/EnvironmentModule.java similarity index 97% rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/EnvironmentModule.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/EnvironmentModule.java index 2cc3fd228..7032d5eb1 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/EnvironmentModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/EnvironmentModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.net.basic.inject; +package org.glyptodon.guacamole.net.basic; import com.google.inject.AbstractModule; import org.glyptodon.guacamole.environment.Environment; diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/TunnelModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java similarity index 93% rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/TunnelModule.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java index 023656d4d..4df334947 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/TunnelModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java @@ -20,15 +20,11 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.net.basic.inject; +package org.glyptodon.guacamole.net.basic; import com.google.inject.servlet.ServletModule; import java.lang.reflect.InvocationTargetException; import org.glyptodon.guacamole.GuacamoleException; -import org.glyptodon.guacamole.net.basic.BasicGuacamoleTunnelServlet; -import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader; -import org.glyptodon.guacamole.net.basic.TunnelLoader; -import org.glyptodon.guacamole.net.basic.TunnelRequestService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/package-info.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/package-info.java deleted file mode 100644 index 6e090e05e..000000000 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/package-info.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2015 Glyptodon LLC - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/** - * Dependency injection classes specific to the Guacamole web application. - */ -package org.glyptodon.guacamole.net.basic.inject; - diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/LogModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/log/LogModule.java similarity index 98% rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/LogModule.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/log/LogModule.java index 5502821a7..94589b807 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/LogModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/log/LogModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.net.basic.inject; +package org.glyptodon.guacamole.net.basic.log; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/AuthenticationModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTAuthModule.java similarity index 92% rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/AuthenticationModule.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTAuthModule.java index be8970e9e..d79746ad3 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/AuthenticationModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTAuthModule.java @@ -20,10 +20,9 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.net.basic.inject; +package org.glyptodon.guacamole.net.basic.rest; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.environment.Environment; import org.glyptodon.guacamole.net.auth.AuthenticationProvider; @@ -41,12 +40,12 @@ import org.slf4j.LoggerFactory; * @author James Muehlner * @author Michael Jumper */ -public class AuthenticationModule extends AbstractModule { +public class RESTAuthModule extends AbstractModule { /** * Logger for this class. */ - private final Logger logger = LoggerFactory.getLogger(AuthenticationModule.class); + private final Logger logger = LoggerFactory.getLogger(RESTAuthModule.class); /** * The Guacamole server environment. @@ -69,7 +68,7 @@ public class AuthenticationModule extends AbstractModule { * An instance of TokenSessionMap to inject as a singleton wherever * needed. */ - public AuthenticationModule(Environment environment, + public RESTAuthModule(Environment environment, TokenSessionMap tokenSessionMap) { this.environment = environment; this.tokenSessionMap = tokenSessionMap; diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/RESTModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServletModule.java similarity index 90% rename from guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/RESTModule.java rename to guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServletModule.java index 09a99c8ec..a6e54c7a6 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/inject/RESTModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/RESTServletModule.java @@ -20,16 +20,13 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.net.basic.inject; +package org.glyptodon.guacamole.net.basic.rest; import com.google.inject.Scopes; import com.google.inject.matcher.Matchers; import com.google.inject.servlet.ServletModule; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import org.codehaus.jackson.jaxrs.JacksonJsonProvider; -import org.glyptodon.guacamole.net.basic.rest.AuthProviderRESTExceptionWrapper; -import org.glyptodon.guacamole.net.basic.rest.AuthProviderRESTExposure; -import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService; import org.glyptodon.guacamole.net.basic.rest.auth.TokenRESTService; import org.glyptodon.guacamole.net.basic.rest.clipboard.ClipboardRESTService; import org.glyptodon.guacamole.net.basic.rest.connection.ConnectionRESTService; @@ -44,7 +41,7 @@ import org.glyptodon.guacamole.net.basic.rest.user.UserRESTService; * * @author James Muehlner */ -public class RESTModule extends ServletModule { +public class RESTServletModule extends ServletModule { @Override protected void configureServlets() { diff --git a/guacamole/src/main/webapp/WEB-INF/web.xml b/guacamole/src/main/webapp/WEB-INF/web.xml index a1baf566b..490bdb335 100644 --- a/guacamole/src/main/webapp/WEB-INF/web.xml +++ b/guacamole/src/main/webapp/WEB-INF/web.xml @@ -42,7 +42,7 @@ - org.glyptodon.guacamole.net.basic.inject.BasicServletContextListener + org.glyptodon.guacamole.net.basic.BasicServletContextListener