SEBSERV-530 added bundled profile instead of ws,gui

src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java

@@ -61,8 +61,8 @@ public class ClientHttpRequestFactoryService {
 
     private static final Logger log = LoggerFactory.getLogger(ClientHttpRequestFactoryService.class);
 
-    private static final Collection<String> DEV_PROFILES = Arrays.asList("dev-gui", "test", "demo", "dev-ws");
-    private static final Collection<String> PROD_PROFILES = Arrays.asList("prod-gui", "prod-ws");
+    private static final Collection<String> DEV_PROFILES = Arrays.asList("dev", "test", "demo");
+    private static final Collection<String> PROD_PROFILES = Arrays.asList("prod", "prod-gui", "prod-ws");
 
     private final int connectTimeout;
     private final int connectionRequestTimeout;

src/main/java/ch/ethz/seb/sebserver/SEBServer.java

@@ -9,22 +9,14 @@
 package ch.ethz.seb.sebserver;
 
 import org.apache.catalina.connector.Connector;
-import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 import org.springframework.security.web.firewall.HttpFirewall;
 import org.springframework.security.web.firewall.StrictHttpFirewall;
 
-import ch.ethz.seb.sebserver.gbl.Constants;
-import ch.ethz.seb.sebserver.gbl.profile.ProdGuiProfile;
-import ch.ethz.seb.sebserver.gbl.profile.ProdWebServiceProfile;
-
 /** SEB-Server (Safe Exam Browser Server) is a server component to maintain and support
  * Exams running with SEB (Safe Exam Browser). TODO add link(s)
  * <p>
@@ -48,35 +40,6 @@ public static void main(final String[] args) {
         SpringApplication.run(SEBServer.class, args);
     }
 
-    /*
-     * Add a redirect Connector on http port to redirect all http calls
-     * to https.
-     *
-     * NOTE: This works with TomcatServletWebServerFactory and embedded tomcat.
-     * If the webservice and/or gui is going to running on another server or
-     * redirect is handled by a proxy, this redirect can be deactivated within
-     * the "sebserver.ssl.redirect.enabled" property set to false
-     */
-    @Bean
-    @ProdWebServiceProfile
-    @ProdGuiProfile
-    public ServletWebServerFactory servletContainer(
-            final Environment env,
-            final ApplicationContext applicationContext) {
-
-        final String enabled = env.getProperty(
-                "sebserver.ssl.redirect.enabled",
-                Constants.FALSE_STRING);
-
-        if (!BooleanUtils.toBoolean(enabled)) {
-            return new TomcatServletWebServerFactory();
-        }
-
-        final TomcatServletWebServerFactory tomcat = new HTTPSRedirectServerFactory();
-        tomcat.addAdditionalTomcatConnectors(redirectConnector(env));
-        return tomcat;
-    }
-
     @Bean
     public HttpFirewall allowEncodedParamsFirewall() {
         final StrictHttpFirewall firewall = new StrictHttpFirewall();

src/main/java/ch/ethz/seb/sebserver/gbl/profile/GuiProfile.java

@@ -16,11 +16,11 @@
 import org.springframework.context.annotation.Profile;
 
 /** Profile annotation for SEB-Server gui components.
- *
+ * <p>
  * Use this as profile annotation on components that are only needed in the web-gui environment
  * but for all vertical profiles like dev, prod and test */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-@Profile({ "dev-gui", "prod-gui", "demo" })
+@Profile({ "gui", "bundled" })
 public @interface GuiProfile {
 }

src/main/java/ch/ethz/seb/sebserver/gbl/profile/WebServiceProfile.java

@@ -16,11 +16,11 @@
 import org.springframework.context.annotation.Profile;
 
 /** Profile annotation for SEB-Server web-service components.
- *
+ * <p>
  * Use this as profile annotation on components that are only needed in the web-service environment
  * but for all vertical profiles like dev, prod and test */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-@Profile({ "dev-ws", "prod-ws", "test", "demo" })
+@Profile({ "ws", "bundled", "test" })
 public @interface WebServiceProfile {
 }

src/main/resources/config/application-bundled.properties

@@ -0,0 +1 @@
+spring.profiles.include=ws,gui