diff --git a/src/main/java/cokr/xit/TsApplication.java b/src/main/java/cokr/xit/TsApplication.java
index 3b471b85..e6b648d7 100644
--- a/src/main/java/cokr/xit/TsApplication.java
+++ b/src/main/java/cokr/xit/TsApplication.java
@@ -3,13 +3,12 @@ package cokr.xit;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ImportResource;
+import cokr.xit.custom.boot.CommonConfig1;
import cokr.xit.custom.boot.DatasourceConfig1;
import cokr.xit.custom.boot.DatasourceConfig2;
import cokr.xit.custom.boot.ServletConfig1;
import cokr.xit.custom.boot.ServletConfig2;
-import cokr.xit.foundation.boot.CommonConfig;
import cokr.xit.foundation.boot.MvcConfig;
import cokr.xit.foundation.boot.TransactionConfig;
import testserver.wsdlserver.lvisserver.WebServiceConfig;
@@ -17,7 +16,7 @@ import testserver.wsdlserver.lvisserver.WebServiceConfig;
@SpringBootApplication
@ImportAutoConfiguration({
- CommonConfig.class,
+ CommonConfig1.class,
ServletConfig1.class,
ServletConfig2.class,
@@ -30,7 +29,6 @@ import testserver.wsdlserver.lvisserver.WebServiceConfig;
WebServiceConfig.class
})
-@ImportResource("classpath:spring/context-*.xml")
public class TsApplication {
public static void main(String[] args) {
diff --git a/src/main/java/cokr/xit/custom/boot/CommonConfig1.java b/src/main/java/cokr/xit/custom/boot/CommonConfig1.java
new file mode 100644
index 00000000..065bdd39
--- /dev/null
+++ b/src/main/java/cokr/xit/custom/boot/CommonConfig1.java
@@ -0,0 +1,113 @@
+package cokr.xit.custom.boot;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.egovframe.rte.fdl.cmmn.trace.LeaveaTrace;
+import org.egovframe.rte.fdl.property.impl.EgovPropertyServiceImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+
+import com.fasterxml.jackson.core.JsonParser.Feature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import cokr.xit.foundation.boot.Yml;
+
+@Configuration
+@ComponentScan(basePackages = {"cokr.xit","externalsystem.sinmungo"})
+public class CommonConfig1 {
+ /**AntPathMatcher를 반환한다.
+ * @return AntPathMatcher
+ */
+ @Bean
+ public AntPathMatcher antPathMatcher() {
+ return new AntPathMatcher();
+ }
+
+ /**ObjectMapper를 반환한다.
+ * @return ObjectMapper
+ */
+ @Bean
+ public ObjectMapper objectMapper() {
+ ObjectMapper bean = new ObjectMapper();
+ bean.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+ bean.configure(Feature.ALLOW_COMMENTS, true);
+ return bean;
+ }
+
+ /**SessionLocaleResolver를 반환한다.
+ * @return SessionLocaleResolver
+ */
+ @Bean
+ public SessionLocaleResolver localeResolver() {
+ SessionLocaleResolver bean = new SessionLocaleResolver();
+ bean.setDefaultLocale(Locale.getDefault());
+ return bean;
+ }
+
+ /**LeaveaTrace를 반환한다.
+ * @return LeaveaTrace
+ */
+ @Bean
+ public LeaveaTrace leaveaTrace() {
+ return new LeaveaTrace();
+ }
+
+ private Yml yml = new Yml("application.yml", "application.yml");
+
+ /**application.yml의 설정 내용을 읽어 MessageSource Bean을 설정하여 반환한다.
+ *
messageSource:
+ * basenames:
+ * - classpath:message/message-common
+ * - classpath:message/authentication-message
+ * - classpath:org/egovframe/rte/fdl/property/messages/properties
+ * @return ReloadableResourceBundleMessageSource
+ */
+ @Bean
+ public ReloadableResourceBundleMessageSource messageSource() {
+ ReloadableResourceBundleMessageSource bean = new ReloadableResourceBundleMessageSource();
+ bean.setDefaultEncoding("UTF-8");
+ bean.setCacheSeconds(60);
+
+ List basenames = yml.getValues("messageSource.basenames");
+ if (!basenames.isEmpty())
+ bean.setBasenames(basenames.toArray(new String[basenames.size()]));
+
+ return bean;
+ }
+
+ /**application.yml의 설정 내용을 읽어 EgovPropertyServiceImpl Bean을 설정하여 반환한다.
+ * propertyService:
+ * properties: # 인라인 프로퍼티가 있을 경우
+ * - property0: value0
+ * - property1: value1
+ * extFileName: #외부 프로퍼티 파일이 있을 경우
+ * - encoding: UTF-8
+ * filename: classpath*:properties/your-file-01.properties
+ * - encoding: UTF-8
+ * filename: classpath*:properties/your-file-02.properties
+ * @return EgovPropertyServiceImpl
+ */
+ @Bean
+ public EgovPropertyServiceImpl propertyService() {
+ EgovPropertyServiceImpl bean = new EgovPropertyServiceImpl();
+
+ Map properties = yml.getMap("propertyService.properties");
+ if (!properties.isEmpty())
+ bean.setProperties(properties);
+
+ Set> filenames = yml.getMaps("propertyService.extFileName").stream().collect(Collectors.toSet());
+ if (!filenames.isEmpty())
+ bean.setExtFileName(filenames);
+
+ return bean;
+ }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 704b3eb2..94dbfc0c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,14 +6,17 @@ server:
spring:
application:
name: dummy-external-system
-
main:
- allow-bean-definition-overriding: true
+ allow-bean-definition-overriding: true
# web-application-type: SERVLET
sql:
init:
platform: mariadb
-
+ mvc:
+ static-path-pattern: /resources/**,/files/**
+ web:
+ resources:
+ static-locations: /resources/,file:files/
internaldb:
datasource:
hikari:
@@ -30,12 +33,6 @@ spring:
username: fimsweb
password: fimsweb!@
auto-commit: false
- mvc:
- static-path-pattern: /resources/**,/files/**
- web:
- resources:
- static-locations: /resources/,file:files/
-
cxf:
diff --git a/src/main/resources/spring/context-scheduler.xml b/src/main/resources/spring/context-scheduler.xml
deleted file mode 100644
index 6eb33022..00000000
--- a/src/main/resources/spring/context-scheduler.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/include/head.jsp b/src/main/webapp/WEB-INF/jsp/include/head.jsp
index e4caf2ff..3a8dea3d 100644
--- a/src/main/webapp/WEB-INF/jsp/include/head.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/head.jsp
@@ -16,9 +16,11 @@
" />
" />
- " />
+ " />
- " />
+ " />
+
+ " />
diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
index 796a1477..f2fea228 100644
--- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
@@ -14,18 +14,21 @@
">
+">
+">
+
">
">
diff --git a/src/main/webapp/resources/html/dialog.html b/src/main/webapp/resources/html/dialog.html
new file mode 100644
index 00000000..982e433e
--- /dev/null
+++ b/src/main/webapp/resources/html/dialog.html
@@ -0,0 +1,15 @@
+
\ No newline at end of file
diff --git a/src/main/webapp/resources/lib/jquery-ui/1.13.2/AUTHORS.txt b/src/main/webapp/resources/lib/jquery-ui/1.13.2/AUTHORS.txt
new file mode 100644
index 00000000..0ee3fb31
--- /dev/null
+++ b/src/main/webapp/resources/lib/jquery-ui/1.13.2/AUTHORS.txt
@@ -0,0 +1,372 @@
+Authors ordered by first contribution
+A list of current team members is available at http://jqueryui.com/about
+
+Paul Bakaus
+Richard Worth
+Yehuda Katz
+Sean Catchpole
+John Resig
+Tane Piper
+Dmitri Gaskin
+Klaus Hartl
+Stefan Petre
+Gilles van den Hoven
+Micheil Bryan Smith
+Jörn Zaefferer
+Marc Grabanski
+Keith Wood
+Brandon Aaron
+Scott González
+Eduardo Lundgren
+Aaron Eisenberger
+Joan Piedra
+Bruno Basto
+Remy Sharp
+Bohdan Ganicky
+David Bolter
+Chi Cheng
+Ca-Phun Ung
+Ariel Flesler
+Maggie Wachs
+Scott Jehl
+Todd Parker
+Andrew Powell
+Brant Burnett
+Douglas Neiner
+Paul Irish
+Ralph Whitbeck
+Thibault Duplessis
+Dominique Vincent
+Jack Hsu
+Adam Sontag
+Carl Fürstenberg
+Kevin Dalman
+Alberto Fernández Capel
+Jacek Jędrzejewski (http://jacek.jedrzejewski.name)
+Ting Kuei
+Samuel Cormier-Iijima
+Jon Palmer
+Ben Hollis
+Justin MacCarthy
+Eyal Kobrigo
+Tiago Freire
+Diego Tres
+Holger Rüprich
+Ziling Zhao
+Mike Alsup
+Robson Braga Araujo
+Pierre-Henri Ausseil
+Christopher McCulloh
+Andrew Newcomb
+Lim Chee Aun
+Jorge Barreiro
+Daniel Steigerwald
+John Firebaugh
+John Enters
+Andrey Kapitcyn
+Dmitry Petrov
+Eric Hynds
+Chairat Sunthornwiphat
+Josh Varner
+Stéphane Raimbault
+Jay Merrifield
+J. Ryan Stinnett
+Peter Heiberg
+Alex Dovenmuehle
+Jamie Gegerson
+Raymond Schwartz
+Phillip Barnes
+Kyle Wilkinson
+Khaled AlHourani
+Marian Rudzynski
+Jean-Francois Remy
+Doug Blood
+Filippo Cavallarin
+Heiko Henning
+Aliaksandr Rahalevich
+Mario Visic
+Xavi Ramirez
+Max Schnur
+Saji Nediyanchath
+Corey Frang
+Aaron Peterson
+Ivan Peters
+Mohamed Cherif Bouchelaghem
+Marcos Sousa
+Michael DellaNoce
+George Marshall
+Tobias Brunner
+Martin Solli
+David Petersen
+Dan Heberden
+William Kevin Manire
+Gilmore Davidson
+Michael Wu
+Adam Parod
+Guillaume Gautreau
+Marcel Toele
+Dan Streetman
+Matt Hoskins
+Giovanni Giacobbi
+Kyle Florence
+Pavol Hluchý
+Hans Hillen
+Mark Johnson
+Trey Hunner
+Shane Whittet
+Edward A Faulkner
+Adam Baratz
+Kato Kazuyoshi
+Eike Send
+Kris Borchers
+Eddie Monge
+Israel Tsadok
+Carson McDonald
+Jason Davies
+Garrison Locke
+David Murdoch
+Benjamin Scott Boyle
+Jesse Baird
+Jonathan Vingiano
+Dylan Just
+Hiroshi Tomita
+Glenn Goodrich
+Tarafder Ashek-E-Elahi
+Ryan Neufeld
+Marc Neuwirth
+Philip Graham
+Benjamin Sterling
+Wesley Walser
+Kouhei Sutou
+Karl Kirch
+Chris Kelly
+Jason Oster
+Felix Nagel
+Alexander Polomoshnov
+David Leal
+Igor Milla
+Dave Methvin
+Florian Gutmann
+Marwan Al Jubeh
+Milan Broum
+Sebastian Sauer
+Gaëtan Muller
+Michel Weimerskirch
+William Griffiths
+Stojce Slavkovski
+David Soms
+David De Sloovere
+Michael P. Jung
+Shannon Pekary
+Dan Wellman
+Matthew Edward Hutton
+James Khoury
+Rob Loach
+Alberto Monteiro
+Alex Rhea
+Krzysztof Rosiński
+Ryan Olton
+Genie <386@mail.com>
+Rick Waldron
+Ian Simpson
+Lev Kitsis
+TJ VanToll
+Justin Domnitz
+Douglas Cerna
+Bert ter Heide
+Jasvir Nagra
+Yuriy Khabarov <13real008@gmail.com>
+Harri Kilpiö
+Lado Lomidze
+Amir E. Aharoni
+Simon Sattes
+Jo Liss
+Guntupalli Karunakar
+Shahyar Ghobadpour
+Lukasz Lipinski
+Timo Tijhof
+Jason Moon
+Martin Frost
+Eneko Illarramendi
+EungJun Yi
+Courtland Allen
+Viktar Varvanovich
+Danny Trunk
+Pavel Stetina
+Michael Stay
+Steven Roussey
+Michael Hollis
+Lee Rowlands
+Timmy Willison
+Karl Swedberg
+Baoju Yuan
+Maciej Mroziński
+Luis Dalmolin
+Mark Aaron Shirley
+Martin Hoch
+Jiayi Yang
+Philipp Benjamin Köppchen
+Sindre Sorhus
+Bernhard Sirlinger
+Jared A. Scheel
+Rafael Xavier de Souza
+John Chen
+Robert Beuligmann
+Dale Kocian
+Mike Sherov
+Andrew Couch
+Marc-Andre Lafortune
+Nate Eagle
+David Souther
+Mathias Stenbom
+Sergey Kartashov
+Avinash R
+Ethan Romba
+Cory Gackenheimer
+Juan Pablo Kaniefsky
+Roman Salnikov
+Anika Henke
+Samuel Bovée
+Fabrício Matté
+Viktor Kojouharov
+Pawel Maruszczyk (http://hrabstwo.net)
+Pavel Selitskas
+Bjørn Johansen
+Matthieu Penant
+Dominic Barnes
+David Sullivan
+Thomas Jaggi
+Vahid Sohrabloo
+Travis Carden
+Bruno M. Custódio
+Nathanael Silverman
+Christian Wenz
+Steve Urmston
+Zaven Muradyan
+Woody Gilk
+Zbigniew Motyka
+Suhail Alkowaileet
+Toshi MARUYAMA
+David Hansen
+Brian Grinstead
+Christian Klammer
+Steven Luscher
+Gan Eng Chin
+Gabriel Schulhof
+Alexander Schmitz
+Vilhjálmur Skúlason
+Siebrand Mazeland
+Mohsen Ekhtiari