diff --git a/pom.xml b/pom.xml index c06f9a93..ca4dc823 100644 --- a/pom.xml +++ b/pom.xml @@ -27,35 +27,6 @@ Java 11 (from eclipse and command-line) and one to build still on Java 8 to support the Jenkins build on CI-Server that still no Java 11 installed --> - - - Demo - - false - - - 1.8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - - com.h2database - h2 - - - - Java 11 diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/GuiInit.java b/src/main/java/ch/ethz/seb/sebserver/gui/GuiInit.java index 76d1b1c8..07f98705 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/GuiInit.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/GuiInit.java @@ -29,7 +29,7 @@ public class GuiInit implements ApplicationListener { INIT_LOGGER.info("----> \\__ \\| _| | _ \\ \\__ \\/ -_)| '_|\\ V // -_)| '_|"); INIT_LOGGER.info("----> |___/|___||___/ |___/\\___||_| \\_/ \\___||_| "); INIT_LOGGER.info("---->"); - INIT_LOGGER.info("----> GUI Service"); + INIT_LOGGER.info("----> **** GUI Service ****"); INIT_LOGGER.info("---->"); INIT_LOGGER.info("----> GUI Service sucessfully successfully started up!"); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java b/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java index ed44739f..34178075 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java @@ -143,10 +143,16 @@ class AdminUserInitializer { private void writeAdminCredentials(final String name, final CharSequence pwd) { WebserviceInit.INIT_LOGGER.info("---->"); + WebserviceInit.INIT_LOGGER.info( + "----> ******************************************************************************************" + + "*****************************************************************************"); WebserviceInit.INIT_LOGGER.info("----> SEB Server initial admin-account; name: {}, pwd: {}", name, pwd); WebserviceInit.INIT_LOGGER.info("---->"); WebserviceInit.INIT_LOGGER.info( "----> !!!! NOTE: Do not forget to login and reset the generated admin password immediately !!!!"); + WebserviceInit.INIT_LOGGER.info( + "----> ******************************************************************************************" + + "*****************************************************************************"); WebserviceInit.INIT_LOGGER.info("---->"); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInit.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInit.java index 16f2088e..3994c785 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInit.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInit.java @@ -52,27 +52,27 @@ public class WebserviceInit implements ApplicationListener ___ ___ ___ ___ "); - INIT_LOGGER.info("----> / __|| __|| _ ) / __| ___ _ _ __ __ ___ _ _ "); - INIT_LOGGER.info("----> \\__ \\| _| | _ \\ \\__ \\/ -_)| '_|\\ V // -_)| '_|"); - INIT_LOGGER.info("----> |___/|___||___/ |___/\\___||_| \\_/ \\___||_| "); - INIT_LOGGER.info("---->"); - INIT_LOGGER.info("----> Webservice"); + + if (!guiProfileActive()) { + + INIT_LOGGER.info("----> ___ ___ ___ ___ "); + INIT_LOGGER.info("----> / __|| __|| _ ) / __| ___ _ _ __ __ ___ _ _ "); + INIT_LOGGER.info("----> \\__ \\| _| | _ \\ \\__ \\/ -_)| '_|\\ V // -_)| '_|"); + INIT_LOGGER.info("----> |___/|___||___/ |___/\\___||_| \\_/ \\___||_| "); + INIT_LOGGER.info("---->"); + } + + INIT_LOGGER.info("----> **** Webservice ****"); INIT_LOGGER.info("---->"); INIT_LOGGER.info("----> Starting up..."); INIT_LOGGER.info("----> "); - INIT_LOGGER.info("----> Init Databse with flyway..."); + INIT_LOGGER.info("----> Init Database with flyway..."); INIT_LOGGER.info("----> TODO "); // TODO integration of Flyway for database initialization and migration: https://flywaydb.org // see also https://flywaydb.org/getstarted/firststeps/api - INIT_LOGGER.info("----> "); - INIT_LOGGER.info("----> Init SEB Server Administrator account if needed..."); - // Create an initial admin account if requested and not already in the data-base - this.adminUserInitializer.initAdminAccount(); - INIT_LOGGER.info("----> "); INIT_LOGGER.info("----> Start Services..."); INIT_LOGGER.info("----> "); @@ -104,6 +104,9 @@ public class WebserviceInit implements ApplicationListener"); INIT_LOGGER.info("----> Property Override Test: {}", this.webserviceInfo.getTestProperty()); + // Create an initial admin account if requested and not already in the data-base + this.adminUserInitializer.initAdminAccount(); + } @PreDestroy @@ -112,4 +115,19 @@ public class WebserviceInit implements ApplicationListener