diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyApplication.java new file mode 100644 index 000000000..97ccb3fe2 --- /dev/null +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyApplication.java @@ -0,0 +1,20 @@ +package org.maxkey; + + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +@SpringBootApplication +public class MaxKeyApplication extends SpringBootServletInitializer { + + public static void main(String[] args) { + SpringApplication.run(MaxKeyApplication.class, args); + } + + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(MaxKeyApplication.class); + } + +} diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyConfig.java new file mode 100644 index 000000000..39036494f --- /dev/null +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyConfig.java @@ -0,0 +1,10 @@ +package org.maxkey; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.ImportResource; + +@Configuration +@ImportResource(locations={"classpath:spring/maxkey_mgt.xml"}) +public class MaxKeyConfig { + +} diff --git a/maxkey-web-manage/src/main/resources/log4j2.xml b/maxkey-web-manage/src/main/resources/log4j2.xml index c7a23b2c7..26bfa620e 100644 --- a/maxkey-web-manage/src/main/resources/log4j2.xml +++ b/maxkey-web-manage/src/main/resources/log4j2.xml @@ -1,26 +1,21 @@ - + - - - - + + + - - + + diff --git a/maxkey-web-maxkey/src/main/resources/log4j2.xml b/maxkey-web-maxkey/src/main/resources/log4j2.xml index 9c1ab46a5..c4c2efcfe 100644 --- a/maxkey-web-maxkey/src/main/resources/log4j2.xml +++ b/maxkey-web-maxkey/src/main/resources/log4j2.xml @@ -1,20 +1,21 @@ - + - - + + - + +