diff --git a/src/main/java/cokr/xit/base/boot/XitBaseApplication2.java b/src/main/java/cokr/xit/base/boot/XitBaseApplication2.java deleted file mode 100644 index 089584c8..00000000 --- a/src/main/java/cokr/xit/base/boot/XitBaseApplication2.java +++ /dev/null @@ -1,26 +0,0 @@ -package cokr.xit.base.boot; - -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.test.context.ContextConfiguration; - -import cokr.xit.foundation.boot.CommonConfig; -import cokr.xit.foundation.boot.DatasourceConfig; -import cokr.xit.foundation.boot.ServletConfig; -import cokr.xit.foundation.boot.TomcatConfig; -import cokr.xit.foundation.boot.TransactionConfig; - -@SpringBootApplication -@ImportAutoConfiguration({ - CommonConfig.class, - ServletConfig.class, - MvcConfig2.class, - DatasourceConfig.class, - TransactionConfig.class, - SecurityConfig.class, - TomcatConfig.class -}) -@ContextConfiguration("classpath:spring/context-*.xml") -public class XitBaseApplication2 { - -} diff --git a/src/main/java/cokr/xit/fims/FimsApplication.java b/src/main/java/cokr/xit/fims/FimsApplication.java index 05425a7e..fbfb3a30 100644 --- a/src/main/java/cokr/xit/fims/FimsApplication.java +++ b/src/main/java/cokr/xit/fims/FimsApplication.java @@ -3,10 +3,10 @@ package cokr.xit.fims; import org.springframework.boot.SpringApplication; import org.springframework.context.annotation.ImportResource; -import cokr.xit.base.boot.XitBaseApplication2; +import cokr.xit.base.boot.XitBaseApplication; @ImportResource("classpath:spring/context-*.xml") -public class FimsApplication extends XitBaseApplication2 { +public class FimsApplication extends XitBaseApplication { public static void main(String[] args) { SpringApplication.run(FimsApplication.class, args); diff --git a/src/main/java/cokr/xit/foundation/boot/TomcatConfig.java b/src/main/java/cokr/xit/foundation/boot/TomcatConfig.java deleted file mode 100644 index 160d62f3..00000000 --- a/src/main/java/cokr/xit/foundation/boot/TomcatConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package cokr.xit.foundation.boot; - -import org.apache.catalina.Context; -import org.apache.catalina.webresources.ExtractingRoot; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class TomcatConfig { - @Bean - public WebServerFactoryCustomizer servletContainerCustomizer() { - return (TomcatServletWebServerFactory container) -> { - container.addContextCustomizers((Context context) -> { - context.setResources(new ExtractingRoot()); - context.setReloadable(false); - }); - }; - } -}